diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-23 12:42:48 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-23 12:42:48 -0700 |
| commit | 4b60ac04a878eaf8344b56189509ccd6925855c2 (patch) | |
| tree | 8a969706f792f58bd6449d3085d83ff9abcbd50f | |
| parent | 6e55a0f71eef07c6041077e6e9e7fad8c973a752 (diff) | |
| parent | cba4ed0039c8b8fac01b3193d19fc2364f934506 (diff) | |
| download | frameworks_av-4b60ac04a878eaf8344b56189509ccd6925855c2.zip frameworks_av-4b60ac04a878eaf8344b56189509ccd6925855c2.tar.gz frameworks_av-4b60ac04a878eaf8344b56189509ccd6925855c2.tar.bz2 | |
Merge "Fixed redefinition of 'i' with a different type error"
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 4 |
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) { |