diff options
| author | Matthew Hoops | 2010-12-16 01:35:13 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-12-16 01:35:13 +0000 |
| commit | 375f32fbe94e8500a03c19ed32865efdcde8ca8e (patch) | |
| tree | 3544a3da06401aea4192a7557294b61734e4d1ef /engines/sword25 | |
| parent | a2bb676c19c70cd79f141650fe0587148c71702b (diff) | |
| download | scummvm-rg350-375f32fbe94e8500a03c19ed32865efdcde8ca8e.tar.gz scummvm-rg350-375f32fbe94e8500a03c19ed32865efdcde8ca8e.tar.bz2 scummvm-rg350-375f32fbe94e8500a03c19ed32865efdcde8ca8e.zip | |
VIDEO: Make VideoDecoder::decodeNextFrame() return a const Surface pointer
svn-id: r54927
Diffstat (limited to 'engines/sword25')
| -rw-r--r-- | engines/sword25/fmv/movieplayer.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/fmv/theora_decoder.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/fmv/theora_decoder.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 4193e02b2e..356c2d11ff 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -124,7 +124,7 @@ bool MoviePlayer::pause() { void MoviePlayer::update() { if (_decoder.isVideoLoaded()) { - Graphics::Surface *s = _decoder.decodeNextFrame(); + const Graphics::Surface *s = _decoder.decodeNextFrame(); if (s) { // Transfer the next frame assert(s->bytesPerPixel == 4); diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index d6c2544fe5..8a0397cdfc 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -329,7 +329,7 @@ void TheoraDecoder::close() { reset(); } -Graphics::Surface *TheoraDecoder::decodeNextFrame() { +const Graphics::Surface *TheoraDecoder::decodeNextFrame() { int i, j; // _stateFlag = false; // playback has not begun diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h index f6c622563b..69bf41b741 100644 --- a/engines/sword25/fmv/theora_decoder.h +++ b/engines/sword25/fmv/theora_decoder.h @@ -67,7 +67,7 @@ public: * @note the return surface should *not* be freed * @note this may return 0, in which case the last frame should be kept on screen */ - Graphics::Surface *decodeNextFrame(); + const Graphics::Surface *decodeNextFrame(); bool isVideoLoaded() const { return _fileStream != 0; |