diff options
Diffstat (limited to 'image')
| -rw-r--r-- | image/codecs/msvideo1.cpp | 5 | ||||
| -rw-r--r-- | image/codecs/msvideo1.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/image/codecs/msvideo1.cpp b/image/codecs/msvideo1.cpp index 0e668d7f0c..439f219fc5 100644 --- a/image/codecs/msvideo1.cpp +++ b/image/codecs/msvideo1.cpp @@ -37,7 +37,7 @@ namespace Image { MSVideo1Decoder::MSVideo1Decoder(uint16 width, uint16 height, byte bitsPerPixel) : Codec() { _surface = new Graphics::Surface(); _surface->create(width, height, (bitsPerPixel == 8) ? Graphics::PixelFormat::createFormatCLUT8() : - Graphics::PixelFormat(2, 5, 5, 5, 0, 0, 5, 10, 0)); + Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0)); _bitsPerPixel = bitsPerPixel; } @@ -216,9 +216,8 @@ void MSVideo1Decoder::decode16(Common::SeekableReadStream &stream) { const Graphics::Surface *MSVideo1Decoder::decodeFrame(Common::SeekableReadStream &stream) { if (_bitsPerPixel == 8) decode8(stream); - else { + else decode16(stream); - } return _surface; } diff --git a/image/codecs/msvideo1.h b/image/codecs/msvideo1.h index a28cc4d10a..f52b1f3127 100644 --- a/image/codecs/msvideo1.h +++ b/image/codecs/msvideo1.h @@ -38,7 +38,7 @@ public: ~MSVideo1Decoder(); const Graphics::Surface *decodeFrame(Common::SeekableReadStream &stream); - Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); } + Graphics::PixelFormat getPixelFormat() const { return _surface->format; } private: byte _bitsPerPixel; |