diff options
| author | Marco Nelissen <marcone@google.com> | 2015-10-06 16:15:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-06 16:15:34 +0000 |
| commit | 8b3aa04a625dfd3adf68118e64da1eafec9db594 (patch) | |
| tree | 80579841d2a5c47e5f497848100bc77540b98e0b /media | |
| parent | 12a68607ce6ac1f27cb89d51dd2627628aed5b39 (diff) | |
| parent | a0c94bc6582dde27ed31fbb771d7eb758fb9adbe (diff) | |
| download | frameworks_av-8b3aa04a625dfd3adf68118e64da1eafec9db594.zip frameworks_av-8b3aa04a625dfd3adf68118e64da1eafec9db594.tar.gz frameworks_av-8b3aa04a625dfd3adf68118e64da1eafec9db594.tar.bz2 | |
am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame
* commit 'a0c94bc6582dde27ed31fbb771d7eb758fb9adbe':
Don't crash when there's no conceal frame
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp index e9ead01..03e4119 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp @@ -19,6 +19,7 @@ #include "vlc_decode.h" #include "bitstream.h" #include "scaling.h" +#include "log/log.h" /* ====================================================================== / Function : ConcealTexture_I() @@ -137,6 +138,10 @@ Modified: 6/04/2001 rewrote the function ****************************************************************************/ void CopyVopMB(Vop *curr, uint8 *prevFrame, int mbnum, int width_Y, int height) { + if (curr == NULL || prevFrame == NULL) { + ALOGE("b/24630158"); + return; + } int width_C = width_Y >> 1; int row = MB_SIZE; uint8 *y1, *y2, *u1, *u2, *v1, *v2; |