Commit d0e83d8e authored Oct 05, 2020 by Marco Nelissen Committed by Automerger Merge Worker Oct 05, 2020

Merge "Fix memory leak and abort" into mainline-prod am: 78374112

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12753274

Change-Id: Ic990bd1582980b0b29cecbebd4e5f7ddaaa3bff9

parents 838c2c7a 78374112

media/extractors/mkv/MatroskaExtractor.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -840,7 +840,7 @@ media_status_t MatroskaSource::readBlock() {
		}

		if (err != OK) {
		mPendingFrames.clear();
		clearPendingFrames();

		mBlockIter.advance();
		mbuf->release();