Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "If we failed to initialize the codec after transitioning to IDLE state, don't assert" into honeycomb

Browse Source
This commit is contained in:
Andreas Huber
2011-01-06 13:26:45 -08:00
committed by Android (Google) Code Review
parent 68e4a7ac84 eec06d3679
commit cc9585fb38
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/OMXCodec.cpp
View File

@@ -1506,7 +1506,7 @@ void OMXCodec::setComponentRole() {
OMXCodec::~OMXCodec() { OMXCodec::~OMXCodec() {
mSource.clear(); mSource.clear();
CHECK(mState == LOADED || mState == ERROR); CHECK(mState == LOADED || mState == ERROR || mState == LOADED_TO_IDLE);
status_t err = mOMX->freeNode(mNode); status_t err = mOMX->freeNode(mNode);
CHECK_EQ(err, (status_t)OK); CHECK_EQ(err, (status_t)OK);