diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 16:40:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-11 16:40:35 +0000 |
| commit | b1ed19a2ed1739c0d415cc81a3b7c458307694ab (patch) | |
| tree | 2054a45c7beb084011dcdba3a73eb8fa1d965334 /media | |
| parent | 7f258f970e2123131638665c9d6674a7e1c7e4ea (diff) | |
| parent | 43c9516a29563131e04ee797562130e2c4f9d54e (diff) | |
| download | frameworks_base-b1ed19a2ed1739c0d415cc81a3b7c458307694ab.zip frameworks_base-b1ed19a2ed1739c0d415cc81a3b7c458307694ab.tar.gz frameworks_base-b1ed19a2ed1739c0d415cc81a3b7c458307694ab.tar.bz2 | |
am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
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 ea890c2..3fef446f 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( |