diff options
| author | Matthew Hoops | 2014-01-17 20:57:45 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2014-01-17 21:02:11 -0500 |
| commit | d73df0d28cbe91e70affd765cf48d2f8a25943eb (patch) | |
| tree | a76da79001f2df58a83ed23fb1463d609c20f2f2 /video/avi_decoder.cpp | |
| parent | 417064e3116e9fbb5737f7f9f13acc54b914e7be (diff) | |
| download | scummvm-rg350-d73df0d28cbe91e70affd765cf48d2f8a25943eb.tar.gz scummvm-rg350-d73df0d28cbe91e70affd765cf48d2f8a25943eb.tar.bz2 scummvm-rg350-d73df0d28cbe91e70affd765cf48d2f8a25943eb.zip | |
VIDEO: Add MJPEG support
Diffstat (limited to 'video/avi_decoder.cpp')
| -rw-r--r-- | video/avi_decoder.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index a3b45995a1..bae5b7babd 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -36,6 +36,7 @@ // Video Codecs #include "video/codecs/cinepak.h" #include "video/codecs/indeo3.h" +#include "video/codecs/mjpeg.h" #include "video/codecs/mpeg.h" #include "video/codecs/msvideo1.h" #include "video/codecs/msrle.h" @@ -82,6 +83,7 @@ namespace Video { #define ID_IV32 MKTAG('i','v','3','2') #define ID_DUCK MKTAG('D','U','C','K') #define ID_MPG2 MKTAG('m','p','g','2') +#define ID_MJPG MKTAG('m','j','p','g') // Stream Types enum { @@ -786,6 +788,8 @@ Codec *AVIDecoder::AVIVideoTrack::createCodec() { case ID_MPG2: return new MPEGDecoder(); #endif + case ID_MJPG: + return new MJPEGDecoder(); default: warning("Unknown/Unhandled compression format \'%s\'", tag2str(_vidsHeader.streamHandler)); } |