commit 61a8495e1e0485bd40f613004bf29f8a925ab37c
author Andrew Top <aabtop@google.com> Tue Apr 30 15:07:33 2019 -0700
committer Andrew Top <aabtop@google.com> Thu May 02 17:06:51 2019 -0700
tree 8b4860759d8854c2c58b6db4cf3ad2bf3f68aa5c
parent 193dc3d54bfe1fcc7a4d95650f8e9f2c8d9e7d1e

Import Cobalt 19.master.0.203780

Includes the following patches:
  https://cobalt-review.googlesource.com/c/cobalt/+/5210
    by errong.leng@samsung.com
  https://cobalt-review.googlesource.com/c/cobalt/+/5270
    by linus.wang@samsung.com

src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc

diff --git a/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc b/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc
index b62f02d..309d6b0 100644
--- a/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc
+++ b/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc
@@ -18,6 +18,9 @@
 #include "starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.h"
 
 #include "starboard/audio_sink.h"
+#if SB_API_VERSION >= SB_MOVE_FORMAT_STRING_VERSION
+#include "starboard/format_string.h"
+#endif  // SB_API_VERSION >= SB_MOVE_FORMAT_STRING_VERSION
 #include "starboard/log.h"
 #include "starboard/memory.h"
 #include "starboard/shared/starboard/media/media_util.h"
@@ -40,6 +43,12 @@
   switch (audio_codec) {
     case kSbMediaAudioCodecAac:
       return AV_CODEC_ID_AAC;
+#if SB_HAS(AC3_AUDIO)
+    case kSbMediaAudioCodecAc3:
+      return AV_CODEC_ID_AC3;
+    case kSbMediaAudioCodecEac3:
+      return AV_CODEC_ID_EAC3;
+#endif  // SB_HAS(AC3_AUDIO)
     case kSbMediaAudioCodecOpus:
       return AV_CODEC_ID_OPUS;
     default: