| Index: media/base/android/media_codec_bridge.cc
|
| diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc
|
| index c28d460bbf270b97f423f051301a36a23223877a..de8bac38d922befdc0455ff1457f53b046c3256f 100644
|
| --- a/media/base/android/media_codec_bridge.cc
|
| +++ b/media/base/android/media_codec_bridge.cc
|
| @@ -7,19 +7,9 @@
|
| #include <algorithm>
|
| #include <limits>
|
|
|
| -#include "base/android/build_info.h"
|
| -#include "base/android/jni_android.h"
|
| -#include "base/android/jni_array.h"
|
| -#include "base/android/jni_string.h"
|
| #include "base/logging.h"
|
| #include "base/strings/string_util.h"
|
| -#include "media/base/decrypt_config.h"
|
| -
|
| -using base::android::AttachCurrentThread;
|
| -using base::android::ConvertJavaStringToUTF8;
|
| -using base::android::ConvertUTF8ToJavaString;
|
| -using base::android::JavaIntArrayToIntVector;
|
| -using base::android::ScopedJavaLocalRef;
|
| +#include "media/base/subsample_entry.h"
|
|
|
| namespace media {
|
|
|
| @@ -39,7 +29,7 @@ MediaCodecStatus MediaCodecBridge::QueueSecureInputBuffer(
|
| const std::vector<char> iv_vec(iv.begin(), iv.end());
|
| return QueueSecureInputBuffer(index, data, data_size, key_vec, iv_vec,
|
| subsamples.empty() ? nullptr : &subsamples[0],
|
| - subsamples.size(), presentation_time);
|
| + (int)subsamples.size(), presentation_time);
|
| }
|
|
|
| MediaCodecStatus MediaCodecBridge::CopyFromOutputBuffer(int index,
|
|
|