diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/base/mime_util_internal.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/base/mime_util_internal.cc')
| -rw-r--r-- | chromium/media/base/mime_util_internal.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/media/base/mime_util_internal.cc b/chromium/media/base/mime_util_internal.cc index 30347811de0..bf57e184925 100644 --- a/chromium/media/base/mime_util_internal.cc +++ b/chromium/media/base/mime_util_internal.cc @@ -8,6 +8,7 @@ #include "base/feature_list.h" #include "base/logging.h" #include "base/no_destructor.h" +#include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -285,11 +286,10 @@ void MimeUtil::AddSupportedMediaFormats() { const CodecSet wav_codecs{PCM}; const CodecSet ogg_audio_codecs{FLAC, OPUS, VORBIS}; -#if !defined(OS_ANDROID) - CodecSet ogg_video_codecs{THEORA, VP8}; -#else - CodecSet ogg_video_codecs; -#endif // !defined(OS_ANDROID) + CodecSet ogg_video_codecs{VP8}; +#if BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) + ogg_video_codecs.emplace(THEORA); +#endif // BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS) CodecSet ogg_codecs(ogg_audio_codecs); ogg_codecs.insert(ogg_video_codecs.begin(), ogg_video_codecs.end()); |