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

2012-05-24 06:53:51 -07:00
parent 05cd296e71 943347cf16
commit 55536138cc
1 changed files with 3 additions and 3 deletions
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -768,12 +768,12 @@ void MatroskaExtractor::findThumbnails() {
        }

        BlockIterator iter(this, info->mTrackNum);
-        int32_t i = 0;
+        int32_t j = 0;
        int64_t thumbnailTimeUs = 0;
        size_t maxBlockSize = 0;
-        while (!iter.eos() && i < 20) {
+        while (!iter.eos() && j < 20) {
            if (iter.block()->IsKey()) {
-                ++i;
+                ++j;

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