| commit | b6855995c22e1d087309b04ad43845d3c6e263ee | [log] [tgz] |
|---|---|---|
| author | Kaido Kert <kaidokert@google.com> | Mon Jun 22 16:39:13 2020 -0700 |
| committer | Kaido Kert <kaidokert@google.com> | Mon Jun 22 17:29:08 2020 -0700 |
| tree | 7631957aaebd9ed3a2e6099782d25fff8090272c | |
| parent | a3dd835b53c74ec0f3e791c01fbcde33bbf26c6d [diff] |
Import Cobalt 21.master.0.270962 Includes the following patches: https://cobalt-review.googlesource.com/c/cobalt/+/5690 by n1214.hwang@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 3d8f090..f4b931d 100644 --- a/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc +++ b/src/starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.cc
@@ -18,9 +18,7 @@ #include "starboard/shared/ffmpeg/ffmpeg_audio_decoder_impl.h" #include "starboard/audio_sink.h" -#if SB_API_VERSION >= 11 -#include "starboard/format_string.h" -#endif // SB_API_VERSION >= 11 +#include "starboard/common/format_string.h" #include "starboard/common/log.h" #include "starboard/common/string.h" #include "starboard/memory.h"
diff --git a/src/starboard/shared/ffmpeg/ffmpeg_video_decoder_impl.cc b/src/starboard/shared/ffmpeg/ffmpeg_video_decoder_impl.cc index 0509caa..9c1f321 100644 --- a/src/starboard/shared/ffmpeg/ffmpeg_video_decoder_impl.cc +++ b/src/starboard/shared/ffmpeg/ffmpeg_video_decoder_impl.cc
@@ -17,9 +17,7 @@ #include "starboard/shared/ffmpeg/ffmpeg_video_decoder_impl.h" -#if SB_API_VERSION >= 11 -#include "starboard/format_string.h" -#endif // SB_API_VERSION >= 11 +#include "starboard/common/format_string.h" #include "starboard/common/string.h" #include "starboard/linux/shared/decode_target_internal.h" #include "starboard/memory.h"