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

Commit aa90ffac authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "libstagefright: Bug Fix" am: b0bec596 am: 950482ba am: 42f45d1f... 

Merge "libstagefright: Bug Fix" am: b0bec596 am: 950482ba am: 42f45d1f am: c4c78af9 am: c3f8f3e9

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



Change-Id: Ic9ab2f337417ef5cf0095b0f239459febcedc2a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 236f6cb7 c3f8f3e9

media/libstagefright/FrameDecoder.cpp

+4 −0
Original line number Diff line number Diff line
@@ -349,6 +349,10 @@ status_t FrameDecoder::extractInternal() { 
    status_t err = OK;

    bool done = false;

    size_t retriesLeft = kRetryCount;

    if (!mDecoder) {

        ALOGE("decoder is not initialized");

        return NO_INIT;

    }

    do {

        size_t index;

        int64_t ptsUs = 0LL;