commit 13b6b51e6d9c399f0bfa55be4eecaf47b63845f2
author Marco Nelissen <marcone@google.com> Tue Oct 06 15:54:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 06 15:54:38 2015 +0000
tree f0ec9a09c02ca435066be79f3a8ff2839e2de544
parent 91f5dc8fce9c37239216a01d78d771ef7592baa2
parent f7d1f627b0b1139f82f16baee482476cc10ccde4

am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame

* commit 'f7d1f627b0b1139f82f16baee482476cc10ccde4':
  Don't crash when there's no conceal frame

media/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp

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 @@
 ****************************************************************************/
 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;