diff options
| author | Ashok Bhat <ashok.bhat@arm.com> | 2014-02-07 12:22:50 +0000 |
|---|---|---|
| committer | David Butcher <david.butcher@arm.com> | 2014-02-07 18:10:22 +0000 |
| commit | d2507a2f3cbe150fdf90d5a3a12b2711774ca3d4 (patch) | |
| tree | bc37779be5fe6ab73bd49cce99ff4b30259a04c1 /media | |
| parent | 449273e2d575041ffe1a5d435666d36923de888b (diff) | |
| download | frameworks_base-d2507a2f3cbe150fdf90d5a3a12b2711774ca3d4.zip frameworks_base-d2507a2f3cbe150fdf90d5a3a12b2711774ca3d4.tar.gz frameworks_base-d2507a2f3cbe150fdf90d5a3a12b2711774ca3d4.tar.bz2 | |
Fix in MediaMuxer's JNI code
android_media_MediaMuxer_native_setup should return jlong. It was
incorrectly returning jint.
Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MediaMuxer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp index 2c16a05..3561b06 100644 --- a/media/jni/android_media_MediaMuxer.cpp +++ b/media/jni/android_media_MediaMuxer.cpp @@ -132,7 +132,7 @@ static void android_media_MediaMuxer_writeSampleData( } // Constructor counterpart. -static jint android_media_MediaMuxer_native_setup( +static jlong android_media_MediaMuxer_native_setup( JNIEnv *env, jclass clazz, jobject fileDescriptor, jint format) { int fd = jniGetFDFromFileDescriptor(env, fileDescriptor); @@ -142,7 +142,7 @@ static jint android_media_MediaMuxer_native_setup( static_cast<MediaMuxer::OutputFormat>(format); sp<MediaMuxer> muxer = new MediaMuxer(fd, fileFormat); muxer->incStrong(clazz); - return int(muxer.get()); + return reinterpret_cast<jlong>(muxer.get()); } static void android_media_MediaMuxer_setOrientationHint( |