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

Commit 17fa4ab4 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is... 

am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"

* commit 'b7ee9c44':
  mediacodec: Return an error on getOutputFormat if there is no output format yet
parents a9ab66c5 b7ee9c44

media/libstagefright/MediaCodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,8 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
            CHECK(msg->senderAwaitsResponse(&replyID));



            if ((mState != STARTED && mState != FLUSHING)

                    || (mFlags & kFlagStickyError)) {

                    || (mFlags & kFlagStickyError)

                    || mOutputFormat == NULL) {

                sp<AMessage> response = new AMessage;

                response->setInt32("err", INVALID_OPERATION);