diff options
| author | Andreas Huber <andih@google.com> | 2012-08-07 11:40:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-07 11:40:05 -0700 |
| commit | 28620ee3e9926ef07f0b4cb3e22b156b812e2d7e (patch) | |
| tree | 9b86960e4b0b76e5d11987de8d51e4ec9fc103a0 /media | |
| parent | 42c5ef98bd09e7d93610d4ca1f4959b63bc3267d (diff) | |
| parent | 972f2321583ef4094477271e0fc6a1d05a1a0eea (diff) | |
| download | frameworks_av-28620ee3e9926ef07f0b4cb3e22b156b812e2d7e.zip frameworks_av-28620ee3e9926ef07f0b4cb3e22b156b812e2d7e.tar.gz frameworks_av-28620ee3e9926ef07f0b4cb3e22b156b812e2d7e.tar.bz2 | |
Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" into jb-mr1-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 67f5a22..2060699 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -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); |