commit 4b418193d3279c7ca50c5e3ab228d1c3c02ecc4d
author Narayan Kamath <narayan@google.com> Fri Mar 07 02:26:53 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 07 02:26:53 2014 +0000
tree 275f29c20db011f1e2a5cfedf0f8a58ced6aae22
parent a3e2b702741855b80ec32d4bcdbf63e4fed3ce5f
parent 860bba68a1d65534ce6aec6ba8c0b0a736b18ccc

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

* commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
  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 2c16a05..3561b06 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(