diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 16:34:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-11 16:34:12 +0000 |
| commit | 43c9516a29563131e04ee797562130e2c4f9d54e (patch) | |
| tree | 2e5e7b3cf511bbc2c487d9ea35eadf56f79310d0 /media | |
| parent | a9d171bd5bab29feaef409489ed23d3c490285ce (diff) | |
| parent | 860bba68a1d65534ce6aec6ba8c0b0a736b18ccc (diff) | |
| download | frameworks_base-43c9516a29563131e04ee797562130e2c4f9d54e.zip frameworks_base-43c9516a29563131e04ee797562130e2c4f9d54e.tar.gz frameworks_base-43c9516a29563131e04ee797562130e2c4f9d54e.tar.bz2 | |
am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
* commit '860bba68a1d65534ce6aec6ba8c0b0a736b18ccc':
Fix in MediaMuxer's JNI code
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( |