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

Commit 07315f82 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error" 

* commit '4b60ac04':
  Fixed redefinition of 'i' with a different type error
parents 78015984 4b60ac04

media/libstagefright/matroska/MatroskaExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -902,8 +902,8 @@ void MatroskaExtractor::findThumbnails() { 
                ++j;



                size_t blockSize = 0;

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

                    blockSize += iter.block()->GetFrame(i).len;

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

                    blockSize += iter.block()->GetFrame(k).len;

                }



                if (blockSize > maxBlockSize) {