diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-24 07:29:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-24 07:29:47 -0700 |
| commit | 960e46f97e3ca22e99548841816ab77ac3a30d86 (patch) | |
| tree | 3245f2587b5c90c1574bdda55b7e4d5563b7eba7 /media/libstagefright | |
| parent | a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7 (diff) | |
| parent | 07315f8262f843f3624c70974642e4fb733a661c (diff) | |
| download | frameworks_av-960e46f97e3ca22e99548841816ab77ac3a30d86.zip frameworks_av-960e46f97e3ca22e99548841816ab77ac3a30d86.tar.gz frameworks_av-960e46f97e3ca22e99548841816ab77ac3a30d86.tar.bz2 | |
am 07315f82: am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '07315f8262f843f3624c70974642e4fb733a661c':
Fixed redefinition of 'i' with a different type error
Diffstat (limited to 'media/libstagefright')
| -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) { |