commit 4b9866e32b15e3512c8a6f84e2709ff542522991
author Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Thu May 24 06:58:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 24 06:58:57 2012 -0700
tree 3bcc6337e925015ccfc5655b31e104b8b2a528a7
parent 54b05aa7b48e77c95fe5e7f30fcd940b690c2119
parent 4719fa8ae1259d6a94ba5b5ecdaa01e69f553996

am 4719fa8a: libstagefright/matroska: Fix build with gcc 4.7

* commit '4719fa8ae1259d6a94ba5b5ecdaa01e69f553996':
  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 8c63df9..feb8e40 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -894,12 +894,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) {