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

[sluicebox]

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:
ef813c6d4d VIDEO: Complete reversion from previous commit


Commit: ef813c6d4de95166e4f8bdbab5d32a1c78a22d76
    https://github.com/scummvm/scummvm/commit/ef813c6d4de95166e4f8bdbab5d32a1c78a22d76
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-25T21:28:41-08:00

Commit Message:
VIDEO: Complete reversion from previous commit

Changed paths:
    video/qt_decoder.cpp
    video/qt_decoder.h


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 26588083ba4..2aece4ce535 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -894,20 +894,10 @@ uint32 QuickTimeDecoder::VideoTrackHandler::getCurEditTrackDuration() const {
 	return _parent->editList[_curEdit].trackDuration * _parent->timeScale / _decoder->_timeScale;
 }
 
-bool QuickTimeDecoder::VideoTrackHandler::atFirstEdit() const {
-	return _curEdit == 0;
-}
-
 bool QuickTimeDecoder::VideoTrackHandler::atLastEdit() const {
 	return _curEdit == _parent->editList.size();
 }
 
-bool QuickTimeDecoder::VideoTrackHandler::beforeCurEdit() const {
-	// We're at the end of the edit once the next frame's time would
-	// bring us past the end of the edit.
-	return getRateAdjustedFrameTime() <= getCurEditTimeOffset();
-}
-
 bool QuickTimeDecoder::VideoTrackHandler::endOfCurEdit() const {
 	// We're at the end of the edit once the next frame's time would
 	// bring us past the end of the edit.
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index adc106303da..207bfb0428f 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -180,9 +180,7 @@ private:
 		uint32 getRateAdjustedFrameTime() const; // media time
 		uint32 getCurEditTimeOffset() const;     // media time
 		uint32 getCurEditTrackDuration() const;  // media time
-		bool atFirstEdit() const;
 		bool atLastEdit() const;
-		bool beforeCurEdit() const;
 		bool endOfCurEdit() const;
 		void checkEditListBounds();
 	};