From d7795892a551643dfd884f884170cb51f70edf92 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Wed, 26 Aug 2009 10:33:47 -0700
Subject: Disregard the EOS buffer flag while flushing or shutting down the
 decoder.

---
 media/libstagefright/OMXCodec.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 1c68f2b5f57b..9cdc7f75ac60 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -857,7 +857,8 @@ void OMXCodec::on_message(const omx_message &msg) {
                 CHECK_EQ(err, OK);
 
                 buffers->removeAt(i);
-            } else if (flags & OMX_BUFFERFLAG_EOS) {
+            } else if (mPortStatus[kPortIndexOutput] == ENABLED
+                       && (flags & OMX_BUFFERFLAG_EOS)) {
                 LOGV("No more output data.");
                 mNoMoreOutputData = true;
                 mBufferFilled.signal();
-- 
cgit v1.2.3-59-g8ed1b