diff options
| author | Matthew Hoops | 2012-11-28 19:33:42 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2013-06-20 00:02:50 -0400 |
| commit | f39c9d58bddc558a3322137684190983ea403d52 (patch) | |
| tree | 115298b2e9a96aa80b6b82c442cb1acc7126571f | |
| parent | 0b81e59d0ad5955c82c26817d6a3260242e794e4 (diff) | |
| download | scummvm-rg350-f39c9d58bddc558a3322137684190983ea403d52.tar.gz scummvm-rg350-f39c9d58bddc558a3322137684190983ea403d52.tar.bz2 scummvm-rg350-f39c9d58bddc558a3322137684190983ea403d52.zip | |
VIDEO: Hook up MPEG decoder to AVI
| -rw-r--r-- | video/avi_decoder.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index 8553642b7c..32238eca4e 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/mpeg.h" #include "video/codecs/msvideo1.h" #include "video/codecs/msrle.h" #include "video/codecs/truemotion1.h" @@ -437,9 +438,10 @@ Codec *AVIDecoder::AVIVideoTrack::createCodec() { case ID_DUCK: return new TrueMotion1Decoder(_bmInfo.width, _bmInfo.height); #endif +#ifdef USE_MPEG2 case ID_MPG2: - warning("Unhandled MPEG-2 codec in AVI file"); - break; + return new MPEGDecoder(); +#endif default: warning("Unknown/Unhandled compression format \'%s\'", tag2str(_vidsHeader.streamHandler)); } |