From b736cb28ab414c16b9cd89923a6da3778847cf2a Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Mon, 10 Jan 2011 11:57:30 -0800
Subject: Return a runtime error instead of asserting if the M4vH263Decoder
 fails in start()

Change-Id: Ie704a72685f749613fa0ed5fa6f461abc0406371
related-to-bug: 3328200
---
 media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
index 0f08f6e9fd18..38778fb3aa71 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
@@ -132,7 +132,10 @@ status_t M4vH263Decoder::start(MetaData *) {
     }
 
     MP4DecodingMode actualMode = PVGetDecBitstreamMode(mHandle);
-    CHECK_EQ(mode, actualMode);
+    if (mode != actualMode) {
+        PVCleanUpVideoDecoder(mHandle);
+        return UNKNOWN_ERROR;
+    }
 
     PVSetPostProcType((VideoDecControls *) mHandle, 0);
 
-- 
cgit v1.2.3-59-g8ed1b