diff options
| author | Matthew Hoops | 2015-01-16 02:10:25 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2015-01-20 20:10:59 -0500 |
| commit | 7d1ee5563a7168843b9f6400010ddd9983abebbc (patch) | |
| tree | 82d693a872ddfcc91d72b99332928cb5468dee42 /video | |
| parent | 1a0f104acfd465fa577dd14a43b368f92794a9d0 (diff) | |
| download | scummvm-rg350-7d1ee5563a7168843b9f6400010ddd9983abebbc.tar.gz scummvm-rg350-7d1ee5563a7168843b9f6400010ddd9983abebbc.tar.bz2 scummvm-rg350-7d1ee5563a7168843b9f6400010ddd9983abebbc.zip | |
VIDEO: Remove the "-1" edit hack
With the previous commits' fixes, it's no longer needed
Diffstat (limited to 'video')
| -rw-r--r-- | video/qt_decoder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 8ce10d9917..08d7620fb2 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -748,9 +748,9 @@ bool QuickTimeDecoder::VideoTrackHandler::atLastEdit() const { } bool QuickTimeDecoder::VideoTrackHandler::endOfCurEdit() const { - // HACK: We're also accepting the time minus one because edit lists - // aren't as accurate as one would hope. - return getRateAdjustedFrameTime() >= getCurEditTimeOffset() + getCurEditTrackDuration() - 1; + // 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() + getCurEditTrackDuration(); } } // End of namespace Video |