am 4b8e3fb5: Merge change 22777 into eclair

Merge commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf' into eclair-plus-aosp

* commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf':
  Disregard the EOS buffer flag while flushing or shutting down the decoder.

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();