diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-11 23:50:40 +0159 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-07-11 23:51:54 +0159 |
| commit | 4a881a3a5f20f69ba741fd9cfedb44991acee832 (patch) | |
| tree | bd7086433e2bc105cc505c8db71e00243428b505 | |
| parent | 119badef85fe6e998299ce4c4a8a598bbdac65c1 (diff) | |
stagefright: Fix triple redefinition of ilinaro_android_4.1.1_topic_toolchain
Needed to fix build with gcc 4.7+
Change-Id: I0767a5a4634f808f779b577cffd74e81dd5439fb
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 8c63df95..8f7d12b9 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -894,16 +894,16 @@ 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) { - blockSize += iter.block()->GetFrame(i).len; + for (int k = 0; k < iter.block()->GetFrameCount(); ++k) { + blockSize += iter.block()->GetFrame(k).len; } if (blockSize > maxBlockSize) { |