From 00b82d39c6d1b4e0594857ef5113f46775c4a065 Mon Sep 17 00:00:00 2001
From: Hong Teng <hongteng@google.com>
Date: Wed, 30 Nov 2011 16:42:56 -0800
Subject: [PATCH] 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
---
 libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 0d5ea64b03..82e149b6f1 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -1396,6 +1396,11 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context,
                 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
-- 
2.11.0