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 /image/codecs/mpeg.cpp | |
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 'image/codecs/mpeg.cpp')
-rw-r--r-- | image/codecs/mpeg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/image/codecs/mpeg.cpp b/image/codecs/mpeg.cpp index d81123f26d..beb042dbf1 100644 --- a/image/codecs/mpeg.cpp +++ b/image/codecs/mpeg.cpp @@ -52,13 +52,13 @@ MPEGDecoder::~MPEGDecoder() { } } -const Graphics::Surface *MPEGDecoder::decodeImage(Common::SeekableReadStream *stream) { +const Graphics::Surface *MPEGDecoder::decodeFrame(Common::SeekableReadStream &stream) { uint32 framePeriod; decodePacket(stream, framePeriod); return _surface; } -bool MPEGDecoder::decodePacket(Common::SeekableReadStream *packet, uint32 &framePeriod, Graphics::Surface *dst) { +bool MPEGDecoder::decodePacket(Common::SeekableReadStream &packet, uint32 &framePeriod, Graphics::Surface *dst) { // Decode as much as we can out of this packet uint32 size = 0xFFFFFFFF; mpeg2_state_t state; @@ -70,7 +70,7 @@ bool MPEGDecoder::decodePacket(Common::SeekableReadStream *packet, uint32 &frame switch (state) { case STATE_BUFFER: - size = packet->read(_buffer, BUFFER_SIZE); + size = packet.read(_buffer, BUFFER_SIZE); mpeg2_buffer(_mpegDecoder, _buffer, _buffer + size); break; case STATE_SLICE: |