diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-30 13:34:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-30 13:34:04 +0000 |
| commit | 56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07 (patch) | |
| tree | a3bb6523db65e8ff2bcc55a6d55c98a6c1e15026 /media/jni | |
| parent | d0f7f41828493b0679e908f7bb3ed3b8e838c463 (diff) | |
| parent | fef85ef152ab176fd96dbe3047c8025136fa8560 (diff) | |
| download | frameworks_base-56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07.zip frameworks_base-56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07.tar.gz frameworks_base-56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07.tar.bz2 | |
Merge "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 221ea57..5fd5dee 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -192,7 +192,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; } |