Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1ed19a2 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

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

* commit '43c9516a':
  Fix in MediaMuxer's JNI code
parents 7f258f97 43c9516a

media/jni/android_media_MediaMuxer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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(