summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-02-16 15:04:53 +0059
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-03-29 09:41:17 +0200
commit0dde4c957a806a141c99eeb075716fb3ecf8686a (patch)
tree706524e747e4f3b9d9273d0edf628f642c8b1123
parent385e2b088ed4d89c018e8ed3b580319b097c48db (diff)
downloadbase-0dde4c957a806a141c99eeb075716fb3ecf8686a.tar.gz
stagefright: Fix build with gcc 4.7
Make it build with gcc 4.7's added strictness Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--media/libstagefright/matroska/MatroskaExtractor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index 20a25d7d2664..bb39893230d7 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -768,12 +768,12 @@ void MatroskaExtractor::findThumbnails() {
}
BlockIterator iter(this, info->mTrackNum);
- int32_t i = 0;
+ int32_t i_ = 0;
int64_t thumbnailTimeUs = 0;
size_t maxBlockSize = 0;
- while (!iter.eos() && i < 20) {
+ while (!iter.eos() && i_ < 20) {
if (iter.block()->IsKey()) {
- ++i;
+ ++i_;
size_t blockSize = 0;
for (int i = 0; i < iter.block()->GetFrameCount(); ++i) {