diff options
author | Matthew Hoops | 2011-05-11 00:30:02 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-05-11 00:30:28 -0400 |
commit | a1d41da096c0bcf502a85919cb1cb1ee471719c5 (patch) | |
tree | 8c51419daa486f1d4833757db4715dadab6c3497 /video/dxa_decoder.cpp | |
parent | accb0c2a5d0c9e7b353cda4b74f511a498ed8073 (diff) | |
parent | 33c3e19cea2a08fbf26ecbe940763e8ee1c37d28 (diff) | |
download | scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.gz scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.bz2 scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.zip |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
audio/decoders/qdm2.h
common/util.cpp
engines/groovie/music.cpp
engines/groovie/resource.h
video/qt_decoder.cpp
video/qt_decoder.h
Diffstat (limited to 'video/dxa_decoder.cpp')
-rw-r--r-- | video/dxa_decoder.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp index a64b8f6fee..9e3f59705c 100644 --- a/video/dxa_decoder.cpp +++ b/video/dxa_decoder.cpp @@ -25,10 +25,11 @@ #include "common/debug.h" #include "common/endian.h" -#include "common/archive.h" #include "common/system.h" #include "common/stream.h" -#include "common/util.h" +#include "common/textconsole.h" + +#include "graphics/surface.h" #include "video/dxa_decoder.h" @@ -101,7 +102,7 @@ bool DXADecoder::loadStream(Common::SeekableReadStream *stream) { } _surface = new Graphics::Surface(); - _surface->bytesPerPixel = 1; + _surface->format = Graphics::PixelFormat::createFormatCLUT8(); debug(2, "flags 0x0%x framesCount %d width %d height %d rate %d", flags, getFrameCount(), getWidth(), getHeight(), getFrameRate().toInt()); |