commit 414d94059f3559b67b4da25a34de6d5312abe06f
author Narayan Kamath <narayan@google.com> Wed Apr 30 15:13:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 30 15:13:02 2014 +0000
tree a6b0ce0265e373a16d5af150cc617472b63d3fb3
parent dbbf431b289bb7a01b43db3412ecab00abe18362
parent 56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07

am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"

* commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
  Cast CallVoidMethod's size_t parameters to jint

media/jni/android_media_MediaCodec.cpp

diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index 221ea57..5fd5dee 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -192,7 +192,7 @@
             env, env->FindClass("android/media/MediaCodec$BufferInfo"));
 
     jmethodID method = env->GetMethodID(clazz.get(), "set", "(IIJI)V");
-    env->CallVoidMethod(bufferInfo, method, offset, size, timeUs, flags);
+    env->CallVoidMethod(bufferInfo, method, (jint)offset, (jint)size, timeUs, flags);
 
     return OK;
 }