diff options
Diffstat (limited to 'video/codecs')
-rw-r--r-- | video/codecs/cdtoons.cpp | 4 | ||||
-rw-r--r-- | video/codecs/cinepak.cpp | 6 | ||||
-rw-r--r-- | video/codecs/cinepak.h | 10 | ||||
-rw-r--r-- | video/codecs/indeo3.cpp | 4 | ||||
-rw-r--r-- | video/codecs/mjpeg.cpp | 8 | ||||
-rw-r--r-- | video/codecs/mjpeg.h | 12 | ||||
-rw-r--r-- | video/codecs/msrle.cpp | 1 | ||||
-rw-r--r-- | video/codecs/msvideo1.cpp | 1 | ||||
-rw-r--r-- | video/codecs/qdm2.cpp | 3 | ||||
-rw-r--r-- | video/codecs/qdm2.h | 4 | ||||
-rw-r--r-- | video/codecs/qtrle.cpp | 2 | ||||
-rw-r--r-- | video/codecs/rpza.cpp | 2 | ||||
-rw-r--r-- | video/codecs/smc.cpp | 1 | ||||
-rw-r--r-- | video/codecs/truemotion1.cpp | 2 |
14 files changed, 47 insertions, 13 deletions
diff --git a/video/codecs/cdtoons.cpp b/video/codecs/cdtoons.cpp index 2d7920fb18..51e3c23eaa 100644 --- a/video/codecs/cdtoons.cpp +++ b/video/codecs/cdtoons.cpp @@ -24,9 +24,9 @@ */ #include "video/codecs/cdtoons.h" +#include "common/rect.h" #include "common/stream.h" - -#include "common/system.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp index 28fcd67a03..2a782dbafe 100644 --- a/video/codecs/cinepak.cpp +++ b/video/codecs/cinepak.cpp @@ -25,7 +25,13 @@ #include "video/codecs/cinepak.h" +#include "common/debug.h" +#include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" +#include "common/util.h" + +#include "graphics/surface.h" // Code here partially based off of ffmpeg ;) diff --git a/video/codecs/cinepak.h b/video/codecs/cinepak.h index 8b4c0216a3..34e4fe98eb 100644 --- a/video/codecs/cinepak.h +++ b/video/codecs/cinepak.h @@ -27,13 +27,19 @@ #define VIDEO_CODECS_CINEPAK_H #include "common/scummsys.h" -#include "common/stream.h" #include "common/rect.h" -#include "graphics/surface.h" #include "graphics/pixelformat.h" #include "video/codecs/codec.h" +namespace Common { +class SeekableReadStream; +} + +namespace Graphics { +struct Surface; +} + namespace Video { struct CinepakCodebook { diff --git a/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp index 742b30243f..b4f6c6ffe3 100644 --- a/video/codecs/indeo3.cpp +++ b/video/codecs/indeo3.cpp @@ -35,8 +35,8 @@ #include "common/system.h" #include "common/endian.h" -#include "common/frac.h" -#include "common/file.h" +#include "common/stream.h" +#include "common/textconsole.h" #include "graphics/conversion.h" diff --git a/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp index 986b1079d3..2ef854039b 100644 --- a/video/codecs/mjpeg.cpp +++ b/video/codecs/mjpeg.cpp @@ -24,10 +24,16 @@ */ #include "common/system.h" -#include "graphics/conversion.h" // For YUV2RGB +#include "common/textconsole.h" +#include "graphics/jpeg.h" +#include "graphics/surface.h" #include "video/codecs/mjpeg.h" +namespace Common { +class SeekableReadStream; +} + namespace Video { JPEGDecoder::JPEGDecoder() : Codec() { diff --git a/video/codecs/mjpeg.h b/video/codecs/mjpeg.h index c9f931f091..d1395a8248 100644 --- a/video/codecs/mjpeg.h +++ b/video/codecs/mjpeg.h @@ -26,12 +26,18 @@ #ifndef VIDEO_CODECS_MJPEG_H #define VIDEO_CODECS_MJPEG_H -#include "common/scummsys.h" - #include "video/codecs/codec.h" -#include "graphics/jpeg.h" #include "graphics/pixelformat.h" +namespace Common { +class SeekableReadStream; +} + +namespace Graphics { +class JPEG; +struct Surface; +} + namespace Video { // Motion JPEG Decoder diff --git a/video/codecs/msrle.cpp b/video/codecs/msrle.cpp index b750efa6a7..19309bc7aa 100644 --- a/video/codecs/msrle.cpp +++ b/video/codecs/msrle.cpp @@ -27,6 +27,7 @@ #include "video/codecs/msrle.h" #include "common/stream.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/msvideo1.cpp b/video/codecs/msvideo1.cpp index 16041b5baa..93e9aaae64 100644 --- a/video/codecs/msvideo1.cpp +++ b/video/codecs/msvideo1.cpp @@ -27,6 +27,7 @@ #include "video/codecs/msvideo1.h" #include "common/stream.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp index 61e59c8aba..8126b57a95 100644 --- a/video/codecs/qdm2.cpp +++ b/video/codecs/qdm2.cpp @@ -34,8 +34,9 @@ #include "video/codecs/qdm2data.h" #include "common/array.h" +#include "common/debug.h" #include "common/stream.h" -#include "common/system.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/qdm2.h b/video/codecs/qdm2.h index a6acf3a83e..b224e801a6 100644 --- a/video/codecs/qdm2.h +++ b/video/codecs/qdm2.h @@ -30,11 +30,11 @@ #define VIDEO_CODECS_QDM2_H namespace Common { - class SeekableReadStream; +class SeekableReadStream; } namespace Audio { - class AudioStream; +class AudioStream; } namespace Video { diff --git a/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp index 78267cc56e..0ae27f6284 100644 --- a/video/codecs/qtrle.cpp +++ b/video/codecs/qtrle.cpp @@ -28,9 +28,11 @@ #include "video/codecs/qtrle.h" +#include "common/debug.h" #include "common/scummsys.h" #include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/colormasks.h" #include "graphics/surface.h" diff --git a/video/codecs/rpza.cpp b/video/codecs/rpza.cpp index c3a983004c..0c06661c50 100644 --- a/video/codecs/rpza.cpp +++ b/video/codecs/rpza.cpp @@ -27,8 +27,10 @@ #include "video/codecs/rpza.h" +#include "common/debug.h" #include "common/system.h" #include "common/stream.h" +#include "common/textconsole.h" #include "graphics/colormasks.h" namespace Video { diff --git a/video/codecs/smc.cpp b/video/codecs/smc.cpp index 2b45a67360..bbd6073497 100644 --- a/video/codecs/smc.cpp +++ b/video/codecs/smc.cpp @@ -27,6 +27,7 @@ #include "video/codecs/smc.h" #include "common/stream.h" +#include "common/textconsole.h" namespace Video { diff --git a/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp index 00c15871a2..70c456d4a8 100644 --- a/video/codecs/truemotion1.cpp +++ b/video/codecs/truemotion1.cpp @@ -32,6 +32,8 @@ #include "video/codecs/truemotion1data.h" #include "common/stream.h" +#include "common/textconsole.h" +#include "common/util.h" namespace Video { |