Commit 59cb5717 authored May 02, 2020 by Marco Nelissen Committed by Automerger Merge Worker May 02, 2020

Merge "Fix out of memory error" into rvc-dev am: c78db377 am: ab878811 am:...

Merge "Fix out of memory error" into rvc-dev am: c78db377 am: ab878811 am: 5e4f8ec5 am: 881c5328

Change-Id: Icc0991cf0223fbf6511ef84dbcbfd4ba5cd3d400

parents e12c8e73 881c5328

media/libstagefright/mpeg2ts/ESQueue.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1153,7 +1153,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitAAC() {
		}

		const RangeInfo &info = *mRangeInfos.begin();
		if (mBuffer->size() < info.mLength) {
		if (info.mLength == 0 \|\| mBuffer->size() < info.mLength) {
		return NULL;
		}