diff options
| author | Matthew Hoops | 2014-02-27 21:27:23 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2014-02-28 00:27:36 -0500 |
| commit | c432b96cf667a1b7f1386cc4c97fcf5411690f7d (patch) | |
| tree | d4cdab5ce30eb4c014b5445a8895059da7ef8cf3 /video | |
| parent | b568ac73b9d2e063eb04693e4610a9932035b696 (diff) | |
| download | scummvm-rg350-c432b96cf667a1b7f1386cc4c97fcf5411690f7d.tar.gz scummvm-rg350-c432b96cf667a1b7f1386cc4c97fcf5411690f7d.tar.bz2 scummvm-rg350-c432b96cf667a1b7f1386cc4c97fcf5411690f7d.zip | |
IMAGE: Merge the JPEG codec into the ImageDecoder
Diffstat (limited to 'video')
| -rw-r--r-- | video/qt_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 25ac05c2b6..20c20d05b1 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -40,7 +40,7 @@ // Video codecs #include "image/codecs/cinepak.h" -#include "image/codecs/jpeg.h" +#include "image/jpeg.h" #include "image/codecs/qtrle.h" #include "image/codecs/rpza.h" #include "image/codecs/smc.h" @@ -297,7 +297,7 @@ void QuickTimeDecoder::VideoSampleDesc::initCodec() { break; case MKTAG('j','p','e','g'): // JPEG: Used by some Myst ME 10th Anniversary videos. - _videoCodec = new Image::JPEGCodec(); + _videoCodec = new Image::JPEGDecoder(); break; case MKTAG('Q','k','B','k'): // CDToons: Used by most of the Broderbund games. |