diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-30 17:36:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 17:36:14 +0000 |
| commit | fad6fa7a04e9227f621dfea9e90f6b867c40af86 (patch) | |
| tree | f3965a295775e22fa94da3ce11833868dc658f42 /media/jni | |
| parent | 52adfdaafd464348628d9257101f24a67d7c8bbb (diff) | |
| parent | 21ccb07fbe97097b6540097d89dd456447779178 (diff) | |
| download | frameworks_base-fad6fa7a04e9227f621dfea9e90f6b867c40af86.zip frameworks_base-fad6fa7a04e9227f621dfea9e90f6b867c40af86.tar.gz frameworks_base-fad6fa7a04e9227f621dfea9e90f6b867c40af86.tar.bz2 | |
am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '21ccb07fbe97097b6540097d89dd456447779178':
Cast CallVoidMethod's size_t parameters to jint
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index d04b1f8..a710c03 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -255,7 +255,7 @@ status_t JMediaCodec::dequeueOutputBuffer( 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; } |