diff options
| author | Matthew Hoops | 2012-08-26 15:49:45 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-26 16:12:25 -0400 |
| commit | bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a (patch) | |
| tree | a434233367725fbb6dc7072776c312f52254d57f /engines/pegasus/movie.h | |
| parent | 7a49b3669a0e18210a2f5409cb35da735f549b11 (diff) | |
| parent | 857b92f8ffececa9c1f990d21a6a8d1630199a62 (diff) | |
| download | scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.tar.gz scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.tar.bz2 scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
devtools/credits.pl
gui/credits.h
Diffstat (limited to 'engines/pegasus/movie.h')
| -rw-r--r-- | engines/pegasus/movie.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/pegasus/movie.h b/engines/pegasus/movie.h index 593442fa44..efe4a7c244 100644 --- a/engines/pegasus/movie.h +++ b/engines/pegasus/movie.h @@ -32,7 +32,7 @@ #include "pegasus/surface.h" namespace Video { - class SeekableVideoDecoder; +class VideoDecoder; } namespace Pegasus { @@ -65,13 +65,13 @@ public: virtual TimeValue getDuration(const TimeScale = 0) const; // *** HACK ALERT - Video::SeekableVideoDecoder *getMovie() { return _video; } + Video::VideoDecoder *getMovie() { return _video; } void setVolume(uint16); protected: void updateTime(); - Video::SeekableVideoDecoder *_video; + Video::VideoDecoder *_video; Common::Rect _movieBox; }; |