[Scummvm-cvs-logs] scummvm master -> 81ea69cd33e19048a80272b3b2a4476179efe2e9

clone2727 clone2727 at gmail.com
Sun Dec 9 19:57:15 CET 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:
81ea69cd33 VIDEO: Fix setRate when _lastTimeChange is less than a frame


Commit: 81ea69cd33e19048a80272b3b2a4476179efe2e9
    https://github.com/scummvm/scummvm/commit/81ea69cd33e19048a80272b3b2a4476179efe2e9
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-12-09T10:56:06-08:00

Commit Message:
VIDEO: Fix setRate when _lastTimeChange is less than a frame

Thanks to bgK for noticing

Changed paths:
    video/video_decoder.cpp



diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index b560143..4d9f19c 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -418,7 +418,7 @@ void VideoDecoder::setRate(const Common::Rational &rate) {
 	_startTime = g_system->getMillis();
 
 	// Adjust start time if we've seeked to something besides zero time
-	if (_lastTimeChange.totalNumberOfFrames() != 0)
+	if (_lastTimeChange != 0)
 		_startTime -= (_lastTimeChange.msecs() / _playbackRate).toInt();
 
 	startAudio();






More information about the Scummvm-git-logs mailing list