commit cba4ed0039c8b8fac01b3193d19fc2364f934506
author Tareq A. Siraj <tareq.a.siraj@intel.com> Thu Jul 26 16:53:14 2012 -0400
committer Edwin Vane <edwin.vane@intel.com> Wed Aug 22 15:01:29 2012 -0400
tree 54289d793301bd0b48e33439ea331d8143df5172
parent 1e75e9721254ae5df05c3d88b30ed7f778406261

Fixed redefinition of 'i' with a different type error

Renamed the redefinition of 'i' to 'k'.

Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>

media/libstagefright/matroska/MatroskaExtractor.cpp

diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index feb8e40..8f7d12b 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -902,8 +902,8 @@
                 ++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) {