commit 55536138cc0febbe83608ee0103aaa9a5202e31f
author Jean-Baptiste Queru <jbq@google.com> Thu May 24 06:53:51 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu May 24 06:53:51 2012 -0700
tree f8992f48af850778bf5412e6d7d1217118e2842c
parent 05cd296e713377c216a4ac5b2d421f4ca0343cda
parent 943347cf16ebb2d9ef5a631fafa3f9effa6b1d11

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

media/libstagefright/matroska/MatroskaExtractor.cpp

diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index 4fbf47e..9ba0e82 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -768,12 +768,12 @@
         }
 
         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) {