diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /image/codecs/codec.cpp | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'image/codecs/codec.cpp')
| -rw-r--r-- | image/codecs/codec.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/image/codecs/codec.cpp b/image/codecs/codec.cpp index 398e9c562c..910fcc18cb 100644 --- a/image/codecs/codec.cpp +++ b/image/codecs/codec.cpp @@ -34,6 +34,7 @@ #include "image/codecs/mpeg.h" #include "image/codecs/msvideo1.h" #include "image/codecs/msrle.h" +#include "image/codecs/msrle4.h" #include "image/codecs/qtrle.h" #include "image/codecs/rpza.h" #include "image/codecs/smc.h" @@ -198,6 +199,8 @@ Codec *createBitmapCodec(uint32 tag, int width, int height, int bitsPerPixel) { return new BitmapRawDecoder(width, height, bitsPerPixel); case SWAP_CONSTANT_32(1): return new MSRLEDecoder(width, height, bitsPerPixel); + case SWAP_CONSTANT_32(2): + return new MSRLE4Decoder(width, height, bitsPerPixel); case MKTAG('C','R','A','M'): case MKTAG('m','s','v','c'): case MKTAG('W','H','A','M'): |