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

Commit 55a701e9 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 3fa1d013: am d7b5f3da: Merge "Fix hang" into klp-dev 

* commit '3fa1d013':
  Fix hang
parents 7b388f90 3fa1d013

media/jni/android_media_MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ status_t JMediaCodec::configure( 
        int flags) {

    sp<Surface> client;

    if (bufferProducer != NULL) {

        mSurfaceTextureClient = new Surface(bufferProducer);

        mSurfaceTextureClient = new Surface(bufferProducer, true /* controlledByApp */);

    } else {

        mSurfaceTextureClient.clear();

    }