diff options
| author | Andreas Huber <andih@google.com> | 2011-01-06 13:26:45 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-06 13:26:45 -0800 |
| commit | cc9585fb38534f0c882cf58d3db9038198beb1b1 (patch) | |
| tree | 7f378b282322a918ffd9b8aabf1a3e99576dd05d | |
| parent | 68e4a7ac849b681b1fb769857fc04f64262480c4 (diff) | |
| parent | eec06d3679db96ec41a017d542c878f3b7070b0e (diff) | |
| download | frameworks_base-cc9585fb38534f0c882cf58d3db9038198beb1b1.zip frameworks_base-cc9585fb38534f0c882cf58d3db9038198beb1b1.tar.gz frameworks_base-cc9585fb38534f0c882cf58d3db9038198beb1b1.tar.bz2 | |
Merge "If we failed to initialize the codec after transitioning to IDLE state, don't assert" into honeycomb
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index f63774a..8efd963 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1506,7 +1506,7 @@ void OMXCodec::setComponentRole() { OMXCodec::~OMXCodec() { mSource.clear(); - CHECK(mState == LOADED || mState == ERROR); + CHECK(mState == LOADED || mState == ERROR || mState == LOADED_TO_IDLE); status_t err = mOMX->freeNode(mNode); CHECK_EQ(err, (status_t)OK); |