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/pegasus.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/pegasus.h')
| -rw-r--r-- | engines/pegasus/pegasus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h index a1b4cff9ab..1ee0136c30 100644 --- a/engines/pegasus/pegasus.h +++ b/engines/pegasus/pegasus.h @@ -50,7 +50,7 @@ namespace Common { } namespace Video { - class SeekableVideoDecoder; + class VideoDecoder; } namespace Pegasus { @@ -253,7 +253,7 @@ private: Hotspot _returnHotspot; InputHandler *_savedHandler; void showTempScreen(const Common::String &fileName); - bool playMovieScaled(Video::SeekableVideoDecoder *video, uint16 x, uint16 y); + bool playMovieScaled(Video::VideoDecoder *video, uint16 x, uint16 y); void throwAwayEverything(); void shellGameInput(const Input &input, const Hotspot *cursorSpot); Common::RandomSource *_rnd; |