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 | e3fb1cb1b1f333aadc780c85de0735143ad864b4 (patch) | |
| tree | 7ecd3e0c98b2614cbe7cb5d2f04340ad6b4d6a14 | |
| parent | be566b488a78e9e5ba0971ebe888d41511a11fa8 (diff) | |
| parent | 58c524ec03b4216587388bf0ce49318d91e4452b (diff) | |
| download | frameworks_base-e3fb1cb1b1f333aadc780c85de0735143ad864b4.zip frameworks_base-e3fb1cb1b1f333aadc780c85de0735143ad864b4.tar.gz frameworks_base-e3fb1cb1b1f333aadc780c85de0735143ad864b4.tar.bz2 | |
Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
| -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; |