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

Commit 6267b35f authored by Marco Nelissen's avatar Marco Nelissen Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ifb0800420235cde32a943c62f6935f58eb1f99d8
parents 70c543cf ab878811

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;

    }