commit b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 08 12:06:48 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Aug 08 12:06:49 2012 -0700
tree e46ebf713b523c4f4a69c04291a10d755b09b98d
parent ffd99cb795c92caee7f4bd0b26af9ae37b100fc3
parent 5c63a648f943b0ec91c3262ced77d1598ff32093

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

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index ff71170..d28322f 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1118,7 +1118,8 @@
             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);