commit b1ed19a2ed1739c0d415cc81a3b7c458307694ab
author Narayan Kamath <narayan@google.com> Tue Feb 11 16:40:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 11 16:40:35 2014 +0000
tree 2054a45c7beb084011dcdba3a73eb8fa1d965334
parent 7f258f970e2123131638665c9d6674a7e1c7e4ea
parent 43c9516a29563131e04ee797562130e2c4f9d54e

am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"

* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
  Fix in MediaMuxer's JNI code

media/jni/android_media_MediaMuxer.cpp

diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp
index ea890c2..3fef446f 100644
--- a/media/jni/android_media_MediaMuxer.cpp
+++ b/media/jni/android_media_MediaMuxer.cpp
@@ -132,7 +132,7 @@
 }
 
 // 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_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(