| Index: media/filters/stream_parser_factory.cc
|
| diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
|
| index 0b836dea01a6219b9a582d6dea7add3c5b87d27c..9c10e364c116d2496672775476c1a1f8fe9e267b 100644
|
| --- a/media/filters/stream_parser_factory.cc
|
| +++ b/media/filters/stream_parser_factory.cc
|
| @@ -25,7 +25,7 @@
|
| #include "media/base/android/media_codec_util.h"
|
| #endif
|
|
|
| -#if defined(USE_PROPRIETARY_CODECS)
|
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
|
| #include "media/formats/mp2t/mp2t_stream_parser.h"
|
| #endif
|
| @@ -107,7 +107,7 @@ static StreamParser* BuildWebMParser(const std::vector<std::string>& codecs,
|
| return new WebMStreamParser();
|
| }
|
|
|
| -#if defined(USE_PROPRIETARY_CODECS)
|
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| bool CheckIfMp4Vp9DemuxingEnabled(const std::string& codec_id,
|
| const scoped_refptr<MediaLog>& media_log) {
|
| return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| @@ -310,7 +310,7 @@ static StreamParser* BuildMP2TParser(const std::vector<std::string>& codecs,
|
| static const SupportedTypeInfo kSupportedTypeInfo[] = {
|
| {"video/webm", &BuildWebMParser, kVideoWebMCodecs},
|
| {"audio/webm", &BuildWebMParser, kAudioWebMCodecs},
|
| -#if defined(USE_PROPRIETARY_CODECS)
|
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| {"audio/aac", &BuildADTSParser, kAudioADTSCodecs},
|
| {"audio/mpeg", &BuildMP3Parser, kAudioMP3Codecs},
|
| {"video/mp4", &BuildMP4Parser, kVideoMP4Codecs},
|
|
|