[Scummvm-git-logs] scummvm master -> c76c0522591004d3e79a4990099ca2122a6414d9

[bgK]

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:
c76c052259 VIDEO: Fix seeking the the last frame of QT videos while playing backwards


Commit: c76c0522591004d3e79a4990099ca2122a6414d9
    https://github.com/scummvm/scummvm/commit/c76c0522591004d3e79a4990099ca2122a6414d9
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-06-29T07:20:28+02:00

Commit Message:
VIDEO: Fix seeking the the last frame of QT videos while playing backwards

Fixes Trac#10590.

Changed paths:
    video/qt_decoder.cpp


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 70f0ae4..4786e61 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -326,8 +326,12 @@ bool QuickTimeDecoder::VideoTrackHandler::seek(const Audio::Timestamp &requested
 			break;
 
 	// If we did reach the end of the track, break out
-	if (atLastEdit())
+	if (atLastEdit()) {
+		// Call setReverse to set the position to the last frame of the last edit
+		if (_reversed)
+			setReverse(true);
 		return true;
+	}
 
 	// If this track is in an empty edit, position us at the next non-empty
 	// edit. There's nothing else to do after this.
@@ -344,8 +348,12 @@ bool QuickTimeDecoder::VideoTrackHandler::seek(const Audio::Timestamp &requested
 	enterNewEditList(false);
 
 	// One extra check for the end of a track
-	if (atLastEdit())
+	if (atLastEdit()) {
+		// Call setReverse to set the position to the last frame of the last edit
+		if (_reversed)
+			setReverse(true);
 		return true;
+	}
 
 	// Now we're in the edit and need to figure out what frame we need
 	Audio::Timestamp time = requestedTime.convertToFramerate(_parent->timeScale);