commit 53ea28aa02caa4963f376254299afdf6c1de9765
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 e56345ffeb4157b9499436493c2e1b89d913ee17
parent 00b82d39c6d1b4e0594857ef5113f46775c4a065
parent 9053a58eb870f3d9a623a8a9117f900a45fd3a96

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

libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp

diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 0d5ea64..82e149b 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/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