From cba4ed0039c8b8fac01b3193d19fc2364f934506 Mon Sep 17 00:00:00 2001
From: "Tareq A. Siraj" <tareq.a.siraj@intel.com>
Date: Thu, 26 Jul 2012 16:53:14 -0400
Subject: 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'media/libstagefright/matroska')

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 @@ 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) {
-- 
cgit v1.1