Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
  Fix in MediaMuxer's JNI code
This commit is contained in:
Narayan Kamath
2014-02-11 16:40:35 +00:00
committed by Android Git Automerger
parent 7f258f970e 43c9516a29
commit b1ed19a2ed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_MediaMuxer.cpp
View File

@@ -132,7 +132,7 @@ static void android_media_MediaMuxer_writeSampleData(
} }
// Constructor counterpart. // Constructor counterpart.
static jint android_media_MediaMuxer_native_setup( static jlong android_media_MediaMuxer_native_setup(
JNIEnv *env, jclass clazz, jobject fileDescriptor, JNIEnv *env, jclass clazz, jobject fileDescriptor,
jint format) { jint format) {
int fd = jniGetFDFromFileDescriptor(env, fileDescriptor); int fd = jniGetFDFromFileDescriptor(env, fileDescriptor);
@@ -142,7 +142,7 @@ static jint android_media_MediaMuxer_native_setup(
static_cast<MediaMuxer::OutputFormat>(format); static_cast<MediaMuxer::OutputFormat>(format);
sp<MediaMuxer> muxer = new MediaMuxer(fd, fileFormat); sp<MediaMuxer> muxer = new MediaMuxer(fd, fileFormat);
muxer->incStrong(clazz); muxer->incStrong(clazz);
return int(muxer.get()); return reinterpret_cast<jlong>(muxer.get());
} }
static void android_media_MediaMuxer_setOrientationHint( static void android_media_MediaMuxer_setOrientationHint(