commit 38ca8aaf3ad045d8623bce0be9b351ae9004abb3
author Hong Teng <hongteng@google.com> Wed Nov 30 16:42:56 2011 -0800
committer Hong Teng <hongteng@google.com> Wed Nov 30 17:35:58 2011 -0800
tree c6cf5834094e169801550b6541dcc994998cc5ae
parent 8e61113210e4c3c1ce57ecef1dda327bea85c19c

Fix for issue 5490443 Native crash while exporting a video
Handle the decoder error case, this modification is to fix the native crash.

Change-Id: I3f2ef62b591ebfb9e01153b80b04eb330f575207

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