commit 54c02a58e5ad4b7b2668f63caa9d189e958f5544
author James Dong <jdong@google.com> Mon Dec 20 12:00:52 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 20 12:00:52 2010 -0800
tree 0933f0a5ef6f40b62b182839efe373815aa69d37
parent a4d153424bf33646a86a7e968064dabb8e073c52
parent 2d1e5d35be5e6d4b55ac8b39fbfcbeb60fcdd084

Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit"

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 69ab75a..352f9fb 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1536,7 +1536,9 @@
     }
 
     err = allocateBuffers();
-    CHECK_EQ(err, (status_t)OK);
+    if (err != (status_t)OK) {
+        return err;
+    }
 
     if (mQuirks & kRequiresLoadedToIdleAfterAllocation) {
         err = mOMX->sendCommand(mNode, OMX_CommandStateSet, OMX_StateIdle);