| commit | f585e2638bbd137762988742fc2cbe613293dc58 | [log] [tgz] |
|---|---|---|
| author | Kaido Kert <kaidokert@google.com> | Mon Jun 08 11:42:28 2020 -0700 |
| committer | Kaido Kert <kaidokert@google.com> | Mon Jun 08 18:39:54 2020 -0700 |
| tree | 8548fc3ff6691a91d772b8033c74d3eece196876 | |
| parent | 9c08e8415ad2e80fcaf050eea4a44bde61922ab4 [diff] [blame] |
Import Cobalt 21.master.0.267507 Includes the following patches: https://cobalt-review.googlesource.com/c/cobalt/+/5630 by devin.cai@mediatek.com https://cobalt-review.googlesource.com/c/cobalt/+/5710 by p.mirgos@samsung.com https://cobalt-review.googlesource.com/c/cobalt/+/5730 by lizhi.fan@samsung.com
diff --git a/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc b/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc index ae422cb..3d8f090 100644 --- a/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc +++ b/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc
@@ -43,12 +43,12 @@ switch (audio_codec) { case kSbMediaAudioCodecAac: return AV_CODEC_ID_AAC; -#if SB_API_VERSION >= SB_FEATURE_RUNTIME_CONFIGS_VERSION || SB_HAS(AC3_AUDIO) +#if SB_API_VERSION >= 12 || SB_HAS(AC3_AUDIO) case kSbMediaAudioCodecAc3: return kSbHasAc3Audio ? AV_CODEC_ID_AC3 : AV_CODEC_ID_NONE; case kSbMediaAudioCodecEac3: return kSbHasAc3Audio ? AV_CODEC_ID_EAC3 : AV_CODEC_ID_NONE; -#endif // SB_API_VERSION >= SB_FEATURE_RUNTIME_CONFIGS_VERSION || +#endif // SB_API_VERSION >= 12 || // SB_HAS(AC3_AUDIO) case kSbMediaAudioCodecOpus: return AV_CODEC_ID_OPUS;