merge in ics-mr1-release history after reset to ics-mr1
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