| Index: media/mp4/mp4_stream_parser.cc
|
| diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc
|
| index 26cee44d14e8c9d2ac99108d4c8e8f1c87fa3ef0..19855abc231ab2f6a8f2b80f3c1deed2d8e735e6 100644
|
| --- a/media/mp4/mp4_stream_parser.cc
|
| +++ b/media/mp4/mp4_stream_parser.cc
|
| @@ -268,9 +268,7 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) {
|
| desc_idx = 0;
|
| const VideoSampleEntry& entry = samp_descr.video_entries[desc_idx];
|
|
|
| - if (!(entry.format == FOURCC_AVC1 ||
|
| - (entry.format == FOURCC_ENCV &&
|
| - entry.sinf.format.format == FOURCC_AVC1))) {
|
| + if (!entry.IsFormatValid()) {
|
| MEDIA_LOG(log_cb_) << "Unsupported video format 0x"
|
| << std::hex << entry.format << " in stsd box.";
|
| return false;
|
|
|