Merge "Fix a crash where the EOS was signalled but some output buffer were still pending." (e3fb1cb1) · Commits · e / os / android_frameworks_base

media/libstagefright/OMXCodec.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1990,7 +1990,7 @@ int64_t OMXCodec::retrieveDecodingTimeUs(bool isCodecSpecific) {
		CHECK(mIsEncoder);

		if (mDecodingTimeList.empty()) {
		CHECK(mNoMoreOutputData);
		CHECK(mSignalledEOS \|\| mNoMoreOutputData);
		// No corresponding input frame available.
		// This could happen when EOS is reached.
		return 0;