diff options
| author | Jamie Gennis <jgennis@google.com> | 2010-12-20 10:22:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-20 10:22:48 -0800 |
| commit | a4d153424bf33646a86a7e968064dabb8e073c52 (patch) | |
| tree | 0109a3b890ff3fedf136894b88c1b17852472bb2 /media | |
| parent | 95289e216a300ddfadf2beec9c8f2c0af3d7e784 (diff) | |
| parent | 60693ddde0e435def1617848f545c78cec452766 (diff) | |
| download | frameworks_av-a4d153424bf33646a86a7e968064dabb8e073c52.zip frameworks_av-a4d153424bf33646a86a7e968064dabb8e073c52.tar.gz frameworks_av-a4d153424bf33646a86a7e968064dabb8e073c52.tar.bz2 | |
Merge "Change a Stagefright assert to an error check."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ status_t OMXCodec::init() { } 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); |