[Scummvm-cvs-logs] scummvm master -> 842b471e45ae8b7c1b4516b9bd5bf39d61112077
clone2727
clone2727 at gmail.com
Fri Oct 7 20:29:50 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
842b471e45 VIDEO: Ensure the sample to chunk index remains valid
Commit: 842b471e45ae8b7c1b4516b9bd5bf39d61112077
https://github.com/scummvm/scummvm/commit/842b471e45ae8b7c1b4516b9bd5bf39d61112077
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-10-07T11:18:08-07:00
Commit Message:
VIDEO: Ensure the sample to chunk index remains valid
Changed paths:
video/qt_decoder.cpp
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 389acea..74bf533 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -486,7 +486,7 @@ Common::SeekableReadStream *QuickTimeDecoder::getNextFramePacket(uint32 &descId)
uint32 sampleToChunkIndex = 0;
for (uint32 i = 0; i < _tracks[_videoTrackIndex]->chunkCount; i++) {
- if (i >= _tracks[_videoTrackIndex]->sampleToChunk[sampleToChunkIndex].first)
+ if (sampleToChunkIndex < _tracks[_videoTrackIndex]->sampleToChunkCount && i >= _tracks[_videoTrackIndex]->sampleToChunk[sampleToChunkIndex].first)
sampleToChunkIndex++;
totalSampleCount += _tracks[_videoTrackIndex]->sampleToChunk[sampleToChunkIndex - 1].count;
More information about the Scummvm-git-logs
mailing list