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

This commit is contained in:
Andreas Huber
2011-01-06 13:26:45 -08:00
committed by Android (Google) Code Review

View File

@@ -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);