diff options
| author | Matthew Hoops | 2014-02-27 21:27:24 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2014-02-28 00:27:37 -0500 |
| commit | 08ea14a8d0e1a1478d1f486edeecea3e619e0cd0 (patch) | |
| tree | 54e46574c82d1aa95c4cca2a16e31faae2e34aea /video | |
| parent | e6717aaf43c7a25d426502a6d5d7028d50aab255 (diff) | |
| download | scummvm-rg350-08ea14a8d0e1a1478d1f486edeecea3e619e0cd0.tar.gz scummvm-rg350-08ea14a8d0e1a1478d1f486edeecea3e619e0cd0.tar.bz2 scummvm-rg350-08ea14a8d0e1a1478d1f486edeecea3e619e0cd0.zip | |
IMAGE: Make Codec take a stream reference; change function name to decodeFrame
Diffstat (limited to 'video')
| -rw-r--r-- | video/avi_decoder.cpp | 2 | ||||
| -rw-r--r-- | video/coktel_decoder.cpp | 2 | ||||
| -rw-r--r-- | video/qt_decoder.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 5e404ecaac..e9c6ef93b2 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -711,7 +711,7 @@ AVIDecoder::AVIVideoTrack::~AVIVideoTrack() { void AVIDecoder::AVIVideoTrack::decodeFrame(Common::SeekableReadStream *stream) { if (stream) { if (_videoCodec) - _lastFrame = _videoCodec->decodeImage(stream); + _lastFrame = _videoCodec->decodeFrame(*stream); } else { // Empty frame _lastFrame = 0; diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index e01c5f3827..21dda15cd0 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -2262,7 +2262,7 @@ bool VMDDecoder::renderFrame(Common::Rect &rect) { return false; Common::MemoryReadStream frameStream(_videoBuffer[0], _videoBufferLen[0]); - const Graphics::Surface *codecSurf = _codec->decodeImage(&frameStream); + const Graphics::Surface *codecSurf = _codec->decodeFrame(frameStream); if (!codecSurf) return false; diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 20c20d05b1..cd3679615b 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -725,7 +725,7 @@ const Graphics::Surface *QuickTimeDecoder::VideoTrackHandler::bufferNextFrame() return 0; } - const Graphics::Surface *frame = entry->_videoCodec->decodeImage(frameData); + const Graphics::Surface *frame = entry->_videoCodec->decodeFrame(*frameData); delete frameData; // Update the palette |