[Scummvm-cvs-logs] scummvm master -> acb127c2d2960fc99ee6e4bb3634b1abaca22a3b

clone2727 clone2727 at gmail.com
Sat Apr 28 21:27:33 CEST 2012


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:
acb127c2d2 AUDIO: Fix seeking in QuickTime files with multiple edit lists


Commit: acb127c2d2960fc99ee6e4bb3634b1abaca22a3b
    https://github.com/scummvm/scummvm/commit/acb127c2d2960fc99ee6e4bb3634b1abaca22a3b
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-04-28T12:22:42-07:00

Commit Message:
AUDIO: Fix seeking in QuickTime files with multiple edit lists

Changed paths:
    audio/decoders/quicktime.cpp



diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp
index 48e76a9..99c1527 100644
--- a/audio/decoders/quicktime.cpp
+++ b/audio/decoders/quicktime.cpp
@@ -449,7 +449,7 @@ void QuickTimeAudioDecoder::QuickTimeAudioTrack::skipSamples(const Timestamp &le
 }
 
 void QuickTimeAudioDecoder::QuickTimeAudioTrack::findEdit(const Timestamp &position) {
-	for (_curEdit = 0; _curEdit < _parentTrack->editCount && position < Timestamp(0, _parentTrack->editList[_curEdit].timeOffset, _decoder->_timeScale); _curEdit++)
+	for (_curEdit = 0; _curEdit < _parentTrack->editCount - 1 && position > Timestamp(0, _parentTrack->editList[_curEdit].timeOffset, _decoder->_timeScale); _curEdit++)
 		;
 
 	enterNewEdit(position);






More information about the Scummvm-git-logs mailing list