commit 2548b06179016c69d02a1655fbf48ab07a13bb72
author Andreas Huber <andih@google.com> Wed Jan 19 09:53:30 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 19 09:53:30 2011 -0800
tree ac6f62957595f7a70edcbea326f5aa614fd9138e
parent c1fcccc92622927c1fe158c80dfaa5d6af4d4371
parent aa46ce8ac441981ecbf9e72fb4acc6677615efc9

am d3bf3eea: am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

* commit 'd3bf3eeadd59748b9cbe7535378b4bdf8dd8f117':
  Turn another assertion into a runtime error. Damn you surfaces.

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index e516cb4..d842f65 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2233,7 +2233,11 @@
                 enablePortAsync(portIndex);
 
                 status_t err = allocateBuffersOnPort(portIndex);
-                CHECK_EQ(err, (status_t)OK);
+
+                if (err != OK) {
+                    CODEC_LOGE("allocateBuffersOnPort failed (err = %d)", err);
+                    setState(ERROR);
+                }
             }
             break;
         }