diff options
| author | James Dong <jdong@google.com> | 2011-08-30 17:06:10 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-08-30 17:06:10 -0700 |
| commit | e8eb2f4f0f8eff0313a27892ab8514223553d943 (patch) | |
| tree | e876f82be05fd6d783301ca9a31f2157c6a79127 /media | |
| parent | 13e6dfbd77a6e2c2832cbfe6dc66f3db8716538b (diff) | |
| download | frameworks_av-e8eb2f4f0f8eff0313a27892ab8514223553d943.zip frameworks_av-e8eb2f4f0f8eff0313a27892ab8514223553d943.tar.gz frameworks_av-e8eb2f4f0f8eff0313a27892ab8514223553d943.tar.bz2 | |
Fix a crash where the EOS was signalled but some output buffer were still pending.
Change-Id: Ide111264501441b51bb10629ae2021accf9e1fb5
related-to-bug: 5234126
Diffstat (limited to 'media')
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 7f09319..d5b013d 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1990,7 +1990,7 @@ int64_t OMXCodec::retrieveDecodingTimeUs(bool isCodecSpecific) { CHECK(mIsEncoder); if (mDecodingTimeList.empty()) { - CHECK(mNoMoreOutputData); + CHECK(mSignalledEOS || mNoMoreOutputData); // No corresponding input frame available. // This could happen when EOS is reached. return 0; |