Merge change 25528 into eclair

* changes:
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.

1 files changed, 7 insertions, 0 deletions

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index ba4c4c7..c4c6149 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1148,6 +1148,13 @@ void OMXCodec::onCmdComplete(OMX_COMMANDTYPE cmd, OMX_U32 data) {
                     CODEC_LOGV("Finished flushing both ports, now continuing from"
                          " seek-time.");
 
+                    // Clear this flag in case the decoder sent us either
+                    // the EVENT_BUFFER_FLAG(1) or an output buffer with
+                    // the EOS flag set _while_ flushing. Since we're going
+                    // to submit "fresh" input data now, this flag no longer
+                    // applies to our future.
+                    mNoMoreOutputData = false;
+
                     drainInputBuffers();
                     fillOutputBuffers();
                 }