Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc9585fb authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "If we failed to initialize the codec after transitioning to IDLE state,... 

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

media/libstagefright/OMXCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);