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/qt_decoder.h | |
| 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/qt_decoder.h')
| -rw-r--r-- | video/qt_decoder.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/video/qt_decoder.h b/video/qt_decoder.h index 7167c8b9a2..6f7eb9450c 100644 --- a/video/qt_decoder.h +++ b/video/qt_decoder.h @@ -35,20 +35,21 @@ #define VIDEO_QT_DECODER_H #include "common/scummsys.h" +#include "common/rational.h" #include "video/video_decoder.h" -#include "video/codecs/codec.h" -#include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/quicktime_intern.h" namespace Common { - class MacResManager; + class Rational; } namespace Video { +class Codec; + /** * Decoder for QuickTime videos. * |