| Index: media/filters/stream_parser_factory.cc
|
| diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
|
| index 52e87e2a234ecd05c8fa26b702f0a3c75f803892..693e651882d6be9a8cdcff79941202977bb24e04 100644
|
| --- a/media/filters/stream_parser_factory.cc
|
| +++ b/media/filters/stream_parser_factory.cc
|
| @@ -161,10 +161,6 @@
|
| CodecInfo::HISTOGRAM_HEVC };
|
| static const CodecInfo kHEVCHVC1CodecInfo = { "hvc1.*", CodecInfo::VIDEO, NULL,
|
| CodecInfo::HISTOGRAM_HEVC };
|
| -#endif
|
| -#if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
|
| -static const CodecInfo kMPEG4VP09CodecInfo = {"vp09.*", CodecInfo::VIDEO, NULL,
|
| - CodecInfo::HISTOGRAM_VP9};
|
| #endif
|
| static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO,
|
| &ValidateMP4ACodecID,
|
| @@ -194,14 +190,11 @@
|
| #endif
|
|
|
| static const CodecInfo* kVideoMP4Codecs[] = {
|
| - &kH264AVC1CodecInfo, &kH264AVC3CodecInfo,
|
| + &kH264AVC1CodecInfo, &kH264AVC3CodecInfo,
|
| #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
|
| - &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo,
|
| -#endif
|
| -#if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
|
| - &kMPEG4VP09CodecInfo,
|
| -#endif
|
| - &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, NULL};
|
| + &kHEVCHEV1CodecInfo, &kHEVCHVC1CodecInfo,
|
| +#endif
|
| + &kMPEG4AACCodecInfo, &kMPEG2AACLCCodecInfo, NULL};
|
|
|
| static const CodecInfo* kAudioMP4Codecs[] = {&kMPEG4AACCodecInfo,
|
| &kMPEG2AACLCCodecInfo,
|
|
|