diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-23 13:01:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-23 13:01:44 -0700 |
| commit | 07315f8262f843f3624c70974642e4fb733a661c (patch) | |
| tree | 98dcde6faf3c948c4d7c69f9dfb95e3c47247960 | |
| parent | 780159840d754eae8e4e3f693ea10932634053f8 (diff) | |
| parent | 4b60ac04a878eaf8344b56189509ccd6925855c2 (diff) | |
| download | frameworks_av-07315f8262f843f3624c70974642e4fb733a661c.zip frameworks_av-07315f8262f843f3624c70974642e4fb733a661c.tar.gz frameworks_av-07315f8262f843f3624c70974642e4fb733a661c.tar.bz2 | |
am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '4b60ac04a878eaf8344b56189509ccd6925855c2':
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) { |