Disregard the EOS buffer flag while flushing or shutting down the decoder.
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 1c68f2b..9cdc7f7 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -857,7 +857,8 @@
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();