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

Commit 28620ee3 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "mediacodec: Return an error on getOutputFormat if there is no output... 

Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" into jb-mr1-dev
parents 42c5ef98 972f2321

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);