diff options
author | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
---|---|---|
committer | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
commit | 798ddfaab500bb212f620cf095328eee5eb140a4 (patch) | |
tree | 55b5d0b90affd88063c04b7ff62fea1616b83e80 /video/qt_decoder.h | |
parent | ef663f95a516d8fe47a245653d418c047361281a (diff) | |
parent | fdc80fd952120ecb8a4941edd4c2e404cdc5fa33 (diff) | |
download | scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.gz scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.bz2 scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.zip |
Merge branch 'master' into hopkins
Diffstat (limited to 'video/qt_decoder.h')
-rw-r--r-- | video/qt_decoder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/video/qt_decoder.h b/video/qt_decoder.h index 71d33711a6..45ab155c2c 100644 --- a/video/qt_decoder.h +++ b/video/qt_decoder.h @@ -53,6 +53,7 @@ class Codec; * * Video decoder used in engines: * - mohawk + * - pegasus * - sci */ class QuickTimeDecoder : public VideoDecoder, public Audio::QuickTimeAudioDecoder { |