From 4719fa8ae1259d6a94ba5b5ecdaa01e69f553996 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Thu, 29 Mar 2012 11:41:17 +0200 Subject: libstagefright/matroska: Fix build with gcc 4.7 gcc 4.7 doesn't like the redefinition of i in the same scope Change-Id: Idf1b33af7041f0302f2f2562442a3e11ce9607d9 Signed-off-by: Bernhard Rosenkraenzer --- media/libstagefright/matroska/MatroskaExtractor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'media/libstagefright/matroska') 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 @@ void MatroskaExtractor::findThumbnails() { } 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) { -- cgit v1.1