diff options
| author | Hong Teng <hongteng@google.com> | 2011-12-02 13:44:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 13:44:09 -0800 |
| commit | 51ecb2eb5ce2a2a6fcf05c1a372242686ce7c787 (patch) | |
| tree | e2ae11f95f4f4ac4aae1ee920af112f5a2fd565d /libvideoeditor | |
| parent | d7689b475da6e17bd96518581d6868f8adaf4792 (diff) | |
| parent | 00b82d39c6d1b4e0594857ef5113f46775c4a065 (diff) | |
| download | frameworks_av-51ecb2eb5ce2a2a6fcf05c1a372242686ce7c787.zip frameworks_av-51ecb2eb5ce2a2a6fcf05c1a372242686ce7c787.tar.gz frameworks_av-51ecb2eb5ce2a2a6fcf05c1a372242686ce7c787.tar.bz2 | |
am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.
* commit '38ca8aaf3ad045d8623bce0be9b351ae9004abb3':
Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp index 6a9c2da..39546db 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 |