diff options
| author | Matthew Hoops | 2012-12-02 22:13:19 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2012-12-02 22:15:11 -0500 |
| commit | 3b581a3b68f6fbff288c4114c1199433fa71b44d (patch) | |
| tree | 96ff02524ca48ae40a7b80ee18381d38504ddc20 /video/video_decoder.h | |
| parent | dc93093afac824dc4407ac969bb5af775b84e5b1 (diff) | |
| download | scummvm-rg350-3b581a3b68f6fbff288c4114c1199433fa71b44d.tar.gz scummvm-rg350-3b581a3b68f6fbff288c4114c1199433fa71b44d.tar.bz2 scummvm-rg350-3b581a3b68f6fbff288c4114c1199433fa71b44d.zip | |
VIDEO: Rework the way the next video track is selected
Fixes missing the last frame in some decoders
Diffstat (limited to 'video/video_decoder.h')
| -rw-r--r-- | video/video_decoder.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/video/video_decoder.h b/video/video_decoder.h index e7626261a2..5fec52cf42 100644 --- a/video/video_decoder.h +++ b/video/video_decoder.h @@ -772,16 +772,13 @@ protected: Graphics::PixelFormat getDefaultHighColorFormat() const { return _defaultHighColorFormat; } /** - * Find the video track with the lowest start time for the next frame + * Set _nextVideoTrack to the video track with the lowest start time for the next frame. + * + * @return _nextVideoTrack */ VideoTrack *findNextVideoTrack(); /** - * Find the video track with the lowest start time for the next frame - */ - const VideoTrack *findNextVideoTrack() const; - - /** * Typedef helpers for accessing tracks */ typedef Common::Array<Track *> TrackList; @@ -806,6 +803,7 @@ private: Audio::Timestamp _lastTimeChange, _endTime; bool _endTimeSet; Common::Rational _playbackRate; + VideoTrack *_nextVideoTrack; // Palette settings from individual tracks mutable bool _dirtyPalette; |