summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/matroska
diff options
context:
space:
mode:
authorTareq A. Siraj <tareq.a.siraj@intel.com>2012-07-26 16:53:14 -0400
committerEdwin Vane <edwin.vane@intel.com>2012-08-22 15:01:29 -0400
commitcba4ed0039c8b8fac01b3193d19fc2364f934506 (patch)
tree54289d793301bd0b48e33439ea331d8143df5172 /media/libstagefright/matroska
parent1e75e9721254ae5df05c3d88b30ed7f778406261 (diff)
downloadframeworks_av-cba4ed0039c8b8fac01b3193d19fc2364f934506.zip
frameworks_av-cba4ed0039c8b8fac01b3193d19fc2364f934506.tar.gz
frameworks_av-cba4ed0039c8b8fac01b3193d19fc2364f934506.tar.bz2
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>
Diffstat (limited to 'media/libstagefright/matroska')
-rw-r--r--media/libstagefright/matroska/MatroskaExtractor.cpp4
1 files changed, 2 insertions, 2 deletions
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) {