| Index: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
|
| diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
|
| index a67dd502ffc433dac2e5b63e2d5a8f079aee66c9..6d27e0b25677eabe0d6468b715d1370ba5a96ddf 100644
|
| --- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
|
| +++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
|
| @@ -512,10 +512,10 @@ int32_t MediaCodecVideoDecoder::DecodeOnCodecThread(
|
|
|
| // Copy encoded data to Java ByteBuffer.
|
| jobject j_input_buffer = input_buffers_[j_input_buffer_index];
|
| - uint8* buffer =
|
| - reinterpret_cast<uint8*>(jni->GetDirectBufferAddress(j_input_buffer));
|
| + uint8_t* buffer =
|
| + reinterpret_cast<uint8_t*>(jni->GetDirectBufferAddress(j_input_buffer));
|
| RTC_CHECK(buffer) << "Indirect buffer??";
|
| - int64 buffer_capacity = jni->GetDirectBufferCapacity(j_input_buffer);
|
| + int64_t buffer_capacity = jni->GetDirectBufferCapacity(j_input_buffer);
|
| if (CheckException(jni) || buffer_capacity < inputImage._length) {
|
| ALOGE("Input frame size %d is bigger than buffer size %d.",
|
| inputImage._length, buffer_capacity);
|
|
|