drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7b7726b7982063034667c6a6076cc0b390ede8ce':
  Fix in MediaMuxer's JNI code
This commit is contained in:
Narayan Kamath
2014-02-11 08:30:25 -08:00
committed by Android Git Automerger
parent 5c770dfba2 7b7726b798
commit 860bba68a1
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.
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(