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

Commit 55536138 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "libstagefright/matroska: Fix build with gcc 4.7"

parents 05cd296e 943347cf

media/libstagefright/matroska/MatroskaExtractor.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -768,12 +768,12 @@ void MatroskaExtractor::findThumbnails() { 
        }

        }





        BlockIterator iter(this, info->mTrackNum);

        BlockIterator iter(this, info->mTrackNum);

        int32_t i = 0;

        int32_t j = 0;

        int64_t thumbnailTimeUs = 0;

        int64_t thumbnailTimeUs = 0;

        size_t maxBlockSize = 0;

        size_t maxBlockSize = 0;

        while (!iter.eos() && i < 20) {

        while (!iter.eos() && j < 20) {

            if (iter.block()->IsKey()) {

            if (iter.block()->IsKey()) {

                ++i;

                ++j;





                size_t blockSize = 0;

                size_t blockSize = 0;

                for (int i = 0; i < iter.block()->GetFrameCount(); ++i) {

                for (int i = 0; i < iter.block()->GetFrameCount(); ++i) {