diff options
| author | James Dong <jdong@google.com> | 2011-08-31 14:17:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-31 14:17:18 -0700 |
| commit | f11b37bc9c92380cafadad7c8988f170687b8dfe (patch) | |
| tree | f7a13b041ec50ecb7dfc50be4f850e6fb03660eb /media | |
| parent | af6764da53c022768290e735bbcc3088bec333d8 (diff) | |
| parent | e8eb2f4f0f8eff0313a27892ab8514223553d943 (diff) | |
| download | frameworks_av-f11b37bc9c92380cafadad7c8988f170687b8dfe.zip frameworks_av-f11b37bc9c92380cafadad7c8988f170687b8dfe.tar.gz frameworks_av-f11b37bc9c92380cafadad7c8988f170687b8dfe.tar.bz2 | |
Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
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; |