[Scummvm-git-logs] scummvm master -> 38d507d9b801d375bedfa612a557ee1a31c345ea

[sluicebox]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b8c97f1561 DIRECTOR: Add newline at EOF
38d507d9b8 VIDEO: Revert QuickTime changes that crash Myst


Commit: b8c97f15612c09a526221d429e6eef21b83a4d80
    https://github.com/scummvm/scummvm/commit/b8c97f15612c09a526221d429e6eef21b83a4d80
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-25T20:52:22-08:00

Commit Message:
DIRECTOR: Add newline at EOF

Changed paths:
    engines/director/lingo/xlibs/moovxobj.h
    engines/director/lingo/xlibs/widgetxobj.h


diff --git a/engines/director/lingo/xlibs/moovxobj.h b/engines/director/lingo/xlibs/moovxobj.h
index 1137c30382c..d89a3d98277 100644
--- a/engines/director/lingo/xlibs/moovxobj.h
+++ b/engines/director/lingo/xlibs/moovxobj.h
@@ -63,4 +63,4 @@ void m_movieDone(int nargs);
 
 } // End of namespace Director
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/director/lingo/xlibs/widgetxobj.h b/engines/director/lingo/xlibs/widgetxobj.h
index 88d43e53b04..d2d1a192e67 100644
--- a/engines/director/lingo/xlibs/widgetxobj.h
+++ b/engines/director/lingo/xlibs/widgetxobj.h
@@ -46,4 +46,4 @@ void m_askQuit(int nargs);
 
 } // End of namespace Director
 
-#endif
\ No newline at end of file
+#endif


Commit: 38d507d9b801d375bedfa612a557ee1a31c345ea
    https://github.com/scummvm/scummvm/commit/38d507d9b801d375bedfa612a557ee1a31c345ea
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-25T20:57:27-08:00

Commit Message:
VIDEO: Revert QuickTime changes that crash Myst

Reverts QuickTime commits that crash multiple Myst videos:
1e877bab26ac3e101788817372f09fc2c0a080a3
156ba82247ff2c99fe7cd56c54e7b393c434944e

Fixes bug #14665

Changed paths:
    video/qt_decoder.cpp


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 9e186944d2e..26588083ba4 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -498,26 +498,7 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::decodeNextFrame()
 	if (endOfTrack())
 		return 0;
 
-	// Playback rate logic, if rate != -1 then seek to our rate adjusted time!
-	if (_decoder->getRate() != 1 && _decoder->getRate() != -1) {
-		seek(_decoder->getTime());
-	}
-
 	if (_reversed) {
-		if (beforeCurEdit()) {
-			_curEdit--;
-
-			if (atFirstEdit()) {
-				return 0;
-			}
-
-			enterNewEditListEntry(false);
-
-			if (isEmptyEdit()) {
-				return 0;
-			}
-		}
-
 		// Subtract one to place us on the frame before the current displayed frame.
 		_curFrame--;