From e8eb2f4f0f8eff0313a27892ab8514223553d943 Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Tue, 30 Aug 2011 17:06:10 -0700
Subject: Fix a crash where the EOS was signalled but some output buffer were
 still pending.

Change-Id: Ide111264501441b51bb10629ae2021accf9e1fb5
related-to-bug: 5234126
---
 media/libstagefright/OMXCodec.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'media')

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;
-- 
cgit v1.1