commit 6756998ef4ac1573e0f879e49a7936285ec61464
author Andreas Huber <andih@google.com> Thu May 02 14:19:50 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 02 14:19:50 2013 -0700
tree 536c986f511fd52d15348b02458a815e184b42cf
parent e1aa23308048da5f2f9902b99b28fad281725011
parent de6bf9cc0fd94452ffcd6685e1469092db74a454

am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev

* commit 'de6bf9cc0fd94452ffcd6685e1469092db74a454':
  Fix miracast source code to ignore the encoder output format change

media/libstagefright/wifi-display/source/Converter.cpp

diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp
index 0a8462c..5344623 100644
--- a/media/libstagefright/wifi-display/source/Converter.cpp
+++ b/media/libstagefright/wifi-display/source/Converter.cpp
@@ -649,6 +649,13 @@
                 &bufferIndex, &offset, &size, &timeUs, &flags);
 
         if (err != OK) {
+            if (err == INFO_FORMAT_CHANGED) {
+                continue;
+            } else if (err == INFO_OUTPUT_BUFFERS_CHANGED) {
+                mEncoder->getOutputBuffers(&mEncoderOutputBuffers);
+                continue;
+            }
+
             if (err == -EAGAIN) {
                 err = OK;
             }