diff options
| author | Matthew Hoops | 2012-07-22 14:11:11 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-07-22 14:11:11 -0400 |
| commit | 7654b2036268bb56f3b08b88858f2a9e4862b056 (patch) | |
| tree | d7a734ec0076d3dd771cd52f78993a2da159c96e /engines/sci | |
| parent | 29541dc5f4dd492f7443463f709a5c6396dab9d8 (diff) | |
| download | scummvm-rg350-7654b2036268bb56f3b08b88858f2a9e4862b056.tar.gz scummvm-rg350-7654b2036268bb56f3b08b88858f2a9e4862b056.tar.bz2 scummvm-rg350-7654b2036268bb56f3b08b88858f2a9e4862b056.zip | |
VIDEO: Merge the three Fixed* VideoTrack classes
Avoids diamond inheritance, which makes it impossible to downcast without rtti
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/video/seq_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h index 75d7ce6c3d..82254990d6 100644 --- a/engines/sci/video/seq_decoder.h +++ b/engines/sci/video/seq_decoder.h @@ -48,7 +48,7 @@ public: bool loadStream(Common::SeekableReadStream *stream); private: - class SEQVideoTrack : public FixedDurationVideoTrack { + class SEQVideoTrack : public FixedRateVideoTrack { public: SEQVideoTrack(Common::SeekableReadStream *stream, uint frameDelay); ~SEQVideoTrack(); |