commit 88b90c3f8f611ce0ddbce7c0261d1726b5d9ac41
author Andreas Huber <andih@google.com> Mon Jan 10 12:04:04 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 10 12:04:04 2011 -0800
tree 11b98dba45992626a17714e04272cdb3fd0fe930
parent d12096de26f97b91c7a969e7fe2c3de1394ce24b
parent 0ecfbd1cf37dbfb44d19c27351f5769309ac028d

am 0c12065f: am b736cb28: Return a runtime error instead of asserting if the M4vH263Decoder fails in start()

* commit '0c12065f037b4fa57d554e794059715f243c88ea':
  Return a runtime error instead of asserting if the M4vH263Decoder fails in start()

media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
index 0f08f6e..38778fb 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
@@ -132,7 +132,10 @@
     }
 
     MP4DecodingMode actualMode = PVGetDecBitstreamMode(mHandle);
-    CHECK_EQ(mode, actualMode);
+    if (mode != actualMode) {
+        PVCleanUpVideoDecoder(mHandle);
+        return UNKNOWN_ERROR;
+    }
 
     PVSetPostProcType((VideoDecControls *) mHandle, 0);