commit b898a5656275b276bcf01ac06331a876c286a998
author The Android Automerger <android-build@android.com> Fri Dec 02 10:25:17 2011 -0800
committer The Android Automerger <android-build@android.com> Fri Dec 02 10:25:17 2011 -0800
tree c6cf5834094e169801550b6541dcc994998cc5ae
parent 38ca8aaf3ad045d8623bce0be9b351ae9004abb3
parent 3eb47933ea238466c575346ebf30a28df7a398fb

merge in ics-mr1-release history after reset to ics-mr1

vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp

diff --git a/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 0d5ea64..82e149b 100755
--- a/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -1396,6 +1396,11 @@
                 break;
             }
             continue;
+        } else if (errStatus != OK) {
+            LOGE("VideoEditorVideoDecoder_decode ERROR:0x%x(%d)",
+                errStatus,errStatus);
+            lerr = errStatus;
+            goto VIDEOEDITOR_VideoDecode_cleanUP;
         }
 
         // The OMXCodec client should expect to receive 0-length buffers