diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-03-29 11:41:17 +0200 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-05-24 06:54:14 -0700 |
| commit | 4719fa8ae1259d6a94ba5b5ecdaa01e69f553996 (patch) | |
| tree | 9d912dd61ecb20212ed0a6ad63a40baccdc05770 /media/libstagefright/matroska | |
| parent | 3c8889e827d95b195fe5ba077a01cb5b6042e534 (diff) | |
| download | frameworks_av-4719fa8ae1259d6a94ba5b5ecdaa01e69f553996.zip frameworks_av-4719fa8ae1259d6a94ba5b5ecdaa01e69f553996.tar.gz frameworks_av-4719fa8ae1259d6a94ba5b5ecdaa01e69f553996.tar.bz2 | |
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 <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |