aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.common1
-rw-r--r--engines/agos/animation.h4
-rw-r--r--engines/gob/videoplayer.h2
-rw-r--r--engines/mohawk/video.cpp2
-rw-r--r--engines/mohawk/video.h2
-rw-r--r--engines/saga/introproc_saga2.cpp2
-rw-r--r--engines/sci/console.cpp4
-rw-r--r--engines/sci/engine/kvideo.cpp6
-rw-r--r--engines/sci/video/seq_decoder.h2
-rw-r--r--engines/scumm/he/animation_he.h2
-rw-r--r--engines/sword1/animation.h6
-rw-r--r--engines/sword25/fmv/theora_decoder.h2
-rw-r--r--engines/toon/movie.h2
-rw-r--r--engines/tucker/tucker.h2
-rw-r--r--graphics/module.mk19
-rw-r--r--video/avi_decoder.cpp (renamed from graphics/video/avi_decoder.cpp)0
-rw-r--r--video/avi_decoder.h (renamed from graphics/video/avi_decoder.h)0
-rw-r--r--video/codecs/cdtoons.cpp (renamed from graphics/video/codecs/cdtoons.cpp)0
-rw-r--r--video/codecs/cdtoons.h (renamed from graphics/video/codecs/cdtoons.h)0
-rw-r--r--video/codecs/cinepak.cpp (renamed from graphics/video/codecs/cinepak.cpp)0
-rw-r--r--video/codecs/cinepak.h (renamed from graphics/video/codecs/cinepak.h)0
-rw-r--r--video/codecs/codec.h (renamed from graphics/video/codecs/codec.h)0
-rw-r--r--video/codecs/indeo3.cpp (renamed from graphics/video/codecs/indeo3.cpp)0
-rw-r--r--video/codecs/indeo3.h (renamed from graphics/video/codecs/indeo3.h)0
-rw-r--r--video/codecs/mjpeg.cpp (renamed from graphics/video/codecs/mjpeg.cpp)0
-rw-r--r--video/codecs/mjpeg.h (renamed from graphics/video/codecs/mjpeg.h)0
-rw-r--r--video/codecs/msrle.cpp (renamed from graphics/video/codecs/msrle.cpp)0
-rw-r--r--video/codecs/msrle.h (renamed from graphics/video/codecs/msrle.h)0
-rw-r--r--video/codecs/msvideo1.cpp (renamed from graphics/video/codecs/msvideo1.cpp)0
-rw-r--r--video/codecs/msvideo1.h (renamed from graphics/video/codecs/msvideo1.h)0
-rw-r--r--video/codecs/qdm2.cpp (renamed from graphics/video/codecs/qdm2.cpp)0
-rw-r--r--video/codecs/qdm2.h (renamed from graphics/video/codecs/qdm2.h)0
-rw-r--r--video/codecs/qdm2data.h (renamed from graphics/video/codecs/qdm2data.h)0
-rw-r--r--video/codecs/qtrle.cpp (renamed from graphics/video/codecs/qtrle.cpp)0
-rw-r--r--video/codecs/qtrle.h (renamed from graphics/video/codecs/qtrle.h)0
-rw-r--r--video/codecs/rpza.cpp (renamed from graphics/video/codecs/rpza.cpp)0
-rw-r--r--video/codecs/rpza.h (renamed from graphics/video/codecs/rpza.h)0
-rw-r--r--video/codecs/smc.cpp (renamed from graphics/video/codecs/smc.cpp)0
-rw-r--r--video/codecs/smc.h (renamed from graphics/video/codecs/smc.h)0
-rw-r--r--video/codecs/truemotion1.cpp (renamed from graphics/video/codecs/truemotion1.cpp)0
-rw-r--r--video/codecs/truemotion1.h (renamed from graphics/video/codecs/truemotion1.h)0
-rw-r--r--video/codecs/truemotion1data.h (renamed from graphics/video/codecs/truemotion1data.h)0
-rw-r--r--video/coktel_decoder.cpp (renamed from graphics/video/coktel_decoder.cpp)0
-rw-r--r--video/coktel_decoder.h (renamed from graphics/video/coktel_decoder.h)0
-rw-r--r--video/dxa_decoder.cpp (renamed from graphics/video/dxa_decoder.cpp)0
-rw-r--r--video/dxa_decoder.h (renamed from graphics/video/dxa_decoder.h)0
-rw-r--r--video/flic_decoder.cpp (renamed from graphics/video/flic_decoder.cpp)0
-rw-r--r--video/flic_decoder.h (renamed from graphics/video/flic_decoder.h)0
-rw-r--r--video/module.mk25
-rw-r--r--video/mpeg_player.cpp (renamed from graphics/video/mpeg_player.cpp)0
-rw-r--r--video/mpeg_player.h (renamed from graphics/video/mpeg_player.h)0
-rw-r--r--video/qt_decoder.cpp (renamed from graphics/video/qt_decoder.cpp)0
-rw-r--r--video/qt_decoder.h (renamed from graphics/video/qt_decoder.h)0
-rw-r--r--video/smk_decoder.cpp (renamed from graphics/video/smk_decoder.cpp)0
-rw-r--r--video/smk_decoder.h (renamed from graphics/video/smk_decoder.h)0
-rw-r--r--video/video_decoder.cpp (renamed from graphics/video/video_decoder.cpp)0
-rw-r--r--video/video_decoder.h (renamed from graphics/video/video_decoder.h)0
57 files changed, 45 insertions, 38 deletions
diff --git a/Makefile.common b/Makefile.common
index 4a9f56a046..f8a665ce24 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -25,6 +25,7 @@ MODULES += \
gui \
backends \
engines \
+ video \
graphics \
sound \
common \
diff --git a/engines/agos/animation.h b/engines/agos/animation.h
index 68a76e1f88..20cc85986e 100644
--- a/engines/agos/animation.h
+++ b/engines/agos/animation.h
@@ -28,8 +28,8 @@
#ifndef AGOS_ANIMATION_H
#define AGOS_ANIMATION_H
-#include "graphics/video/dxa_decoder.h"
-#include "graphics/video/smk_decoder.h"
+#include "video/dxa_decoder.h"
+#include "video/smk_decoder.h"
#include "sound/mixer.h"
namespace AGOS {
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index 26c2c32a3c..fff2a951e4 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -32,7 +32,7 @@
#include "common/str.h"
#include "graphics/surface.h"
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
#include "gob/util.h"
#include "gob/draw.h"
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index b8fc0e7c39..0a9705a4db 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -28,7 +28,7 @@
#include "mohawk/video.h"
#include "common/events.h"
-#include "graphics/video/qt_decoder.h"
+#include "video/qt_decoder.h"
namespace Mohawk {
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 43cffb6363..9661dbcd25 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -28,7 +28,7 @@
#include "common/array.h"
#include "graphics/pixelformat.h"
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
namespace Mohawk {
diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp
index ec157b4a13..c16c95a2a7 100644
--- a/engines/saga/introproc_saga2.cpp
+++ b/engines/saga/introproc_saga2.cpp
@@ -33,7 +33,7 @@
#include "sound/mixer.h"
#include "graphics/surface.h"
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
namespace Saga {
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 1ff0a1550c..71697d6c0a 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -49,10 +49,10 @@
#include "sci/parser/vocabulary.h"
-#include "graphics/video/avi_decoder.h"
+#include "video/avi_decoder.h"
#include "sci/video/seq_decoder.h"
#ifdef ENABLE_SCI32
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
#endif
#include "common/file.h"
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index f3cf8b68d0..86e2d333a3 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -30,11 +30,11 @@
#include "sci/graphics/palette.h"
#include "sci/graphics/screen.h"
#include "graphics/cursorman.h"
-#include "graphics/video/avi_decoder.h"
-#include "graphics/video/qt_decoder.h"
+#include "video/avi_decoder.h"
+#include "video/qt_decoder.h"
#include "sci/video/seq_decoder.h"
#ifdef ENABLE_SCI32
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
#endif
namespace Sci {
diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h
index 4150137223..a7f403c4d2 100644
--- a/engines/sci/video/seq_decoder.h
+++ b/engines/sci/video/seq_decoder.h
@@ -26,7 +26,7 @@
#ifndef SEQ_DECODER_H
#define SEQ_DECODER_H
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
namespace Sci {
diff --git a/engines/scumm/he/animation_he.h b/engines/scumm/he/animation_he.h
index af4ec2041d..756bc666d8 100644
--- a/engines/scumm/he/animation_he.h
+++ b/engines/scumm/he/animation_he.h
@@ -26,7 +26,7 @@
#if !defined(SCUMM_HE_ANIMATION_H) && defined(ENABLE_HE)
#define SCUMM_HE_ANIMATION_H
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
#include "sound/mixer.h"
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 193d5cf7ca..4ac3ddce63 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -26,9 +26,9 @@
#ifndef SWORD1_ANIMATION_H
#define SWORD1_ANIMATION_H
-#include "graphics/video/dxa_decoder.h"
-#include "graphics/video/smk_decoder.h"
-#include "graphics/video/video_decoder.h"
+#include "video/dxa_decoder.h"
+#include "video/smk_decoder.h"
+#include "video/video_decoder.h"
#include "common/array.h"
diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h
index 7b97d43729..b06d0abef0 100644
--- a/engines/sword25/fmv/theora_decoder.h
+++ b/engines/sword25/fmv/theora_decoder.h
@@ -30,7 +30,7 @@
#ifdef USE_THEORADEC
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
diff --git a/engines/toon/movie.h b/engines/toon/movie.h
index 9abbcdf66f..8b34fe3039 100644
--- a/engines/toon/movie.h
+++ b/engines/toon/movie.h
@@ -27,7 +27,7 @@
#define TOON_MOVIE_H
#include "toon/toon.h"
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
namespace Toon {
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 1932b18174..7feb58ddda 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -33,7 +33,7 @@
#include "common/random.h"
#include "common/stream.h"
-#include "graphics/video/flic_decoder.h"
+#include "video/flic_decoder.h"
#include "sound/mixer.h"
diff --git a/graphics/module.mk b/graphics/module.mk
index 827c0ac11e..cef50cd492 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -23,25 +23,6 @@ MODULE_OBJS := \
thumbnail.o \
VectorRenderer.o \
VectorRendererSpec.o \
- video/avi_decoder.o \
- video/coktel_decoder.o \
- video/dxa_decoder.o \
- video/flic_decoder.o \
- video/mpeg_player.o \
- video/qt_decoder.o \
- video/smk_decoder.o \
- video/video_decoder.o \
- video/codecs/cdtoons.o \
- video/codecs/cinepak.o \
- video/codecs/indeo3.o \
- video/codecs/mjpeg.o \
- video/codecs/msrle.o \
- video/codecs/msvideo1.o \
- video/codecs/qdm2.o \
- video/codecs/qtrle.o \
- video/codecs/rpza.o \
- video/codecs/smc.o \
- video/codecs/truemotion1.o
ifdef USE_SCALERS
MODULE_OBJS += \
diff --git a/graphics/video/avi_decoder.cpp b/video/avi_decoder.cpp
index ed0b063147..ed0b063147 100644
--- a/graphics/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
diff --git a/graphics/video/avi_decoder.h b/video/avi_decoder.h
index 9f9f5ed617..9f9f5ed617 100644
--- a/graphics/video/avi_decoder.h
+++ b/video/avi_decoder.h
diff --git a/graphics/video/codecs/cdtoons.cpp b/video/codecs/cdtoons.cpp
index c3d00d8702..c3d00d8702 100644
--- a/graphics/video/codecs/cdtoons.cpp
+++ b/video/codecs/cdtoons.cpp
diff --git a/graphics/video/codecs/cdtoons.h b/video/codecs/cdtoons.h
index 3695302fec..3695302fec 100644
--- a/graphics/video/codecs/cdtoons.h
+++ b/video/codecs/cdtoons.h
diff --git a/graphics/video/codecs/cinepak.cpp b/video/codecs/cinepak.cpp
index 3264810908..3264810908 100644
--- a/graphics/video/codecs/cinepak.cpp
+++ b/video/codecs/cinepak.cpp
diff --git a/graphics/video/codecs/cinepak.h b/video/codecs/cinepak.h
index b1daece1f3..b1daece1f3 100644
--- a/graphics/video/codecs/cinepak.h
+++ b/video/codecs/cinepak.h
diff --git a/graphics/video/codecs/codec.h b/video/codecs/codec.h
index 4fa1a041a2..4fa1a041a2 100644
--- a/graphics/video/codecs/codec.h
+++ b/video/codecs/codec.h
diff --git a/graphics/video/codecs/indeo3.cpp b/video/codecs/indeo3.cpp
index a19764dc11..a19764dc11 100644
--- a/graphics/video/codecs/indeo3.cpp
+++ b/video/codecs/indeo3.cpp
diff --git a/graphics/video/codecs/indeo3.h b/video/codecs/indeo3.h
index d074facea2..d074facea2 100644
--- a/graphics/video/codecs/indeo3.h
+++ b/video/codecs/indeo3.h
diff --git a/graphics/video/codecs/mjpeg.cpp b/video/codecs/mjpeg.cpp
index dc8eb4a58b..dc8eb4a58b 100644
--- a/graphics/video/codecs/mjpeg.cpp
+++ b/video/codecs/mjpeg.cpp
diff --git a/graphics/video/codecs/mjpeg.h b/video/codecs/mjpeg.h
index daa8b12dbb..daa8b12dbb 100644
--- a/graphics/video/codecs/mjpeg.h
+++ b/video/codecs/mjpeg.h
diff --git a/graphics/video/codecs/msrle.cpp b/video/codecs/msrle.cpp
index a3929fc1fd..a3929fc1fd 100644
--- a/graphics/video/codecs/msrle.cpp
+++ b/video/codecs/msrle.cpp
diff --git a/graphics/video/codecs/msrle.h b/video/codecs/msrle.h
index 02b9199e4e..02b9199e4e 100644
--- a/graphics/video/codecs/msrle.h
+++ b/video/codecs/msrle.h
diff --git a/graphics/video/codecs/msvideo1.cpp b/video/codecs/msvideo1.cpp
index 176efc037f..176efc037f 100644
--- a/graphics/video/codecs/msvideo1.cpp
+++ b/video/codecs/msvideo1.cpp
diff --git a/graphics/video/codecs/msvideo1.h b/video/codecs/msvideo1.h
index 1b908a6243..1b908a6243 100644
--- a/graphics/video/codecs/msvideo1.h
+++ b/video/codecs/msvideo1.h
diff --git a/graphics/video/codecs/qdm2.cpp b/video/codecs/qdm2.cpp
index e34c569feb..e34c569feb 100644
--- a/graphics/video/codecs/qdm2.cpp
+++ b/video/codecs/qdm2.cpp
diff --git a/graphics/video/codecs/qdm2.h b/video/codecs/qdm2.h
index 9eb566d04d..9eb566d04d 100644
--- a/graphics/video/codecs/qdm2.h
+++ b/video/codecs/qdm2.h
diff --git a/graphics/video/codecs/qdm2data.h b/video/codecs/qdm2data.h
index 25ed102c4e..25ed102c4e 100644
--- a/graphics/video/codecs/qdm2data.h
+++ b/video/codecs/qdm2data.h
diff --git a/graphics/video/codecs/qtrle.cpp b/video/codecs/qtrle.cpp
index 380b89903c..380b89903c 100644
--- a/graphics/video/codecs/qtrle.cpp
+++ b/video/codecs/qtrle.cpp
diff --git a/graphics/video/codecs/qtrle.h b/video/codecs/qtrle.h
index f0d2587f30..f0d2587f30 100644
--- a/graphics/video/codecs/qtrle.h
+++ b/video/codecs/qtrle.h
diff --git a/graphics/video/codecs/rpza.cpp b/video/codecs/rpza.cpp
index 6869eaca7d..6869eaca7d 100644
--- a/graphics/video/codecs/rpza.cpp
+++ b/video/codecs/rpza.cpp
diff --git a/graphics/video/codecs/rpza.h b/video/codecs/rpza.h
index 8be9088bc3..8be9088bc3 100644
--- a/graphics/video/codecs/rpza.h
+++ b/video/codecs/rpza.h
diff --git a/graphics/video/codecs/smc.cpp b/video/codecs/smc.cpp
index 1b92d3bf85..1b92d3bf85 100644
--- a/graphics/video/codecs/smc.cpp
+++ b/video/codecs/smc.cpp
diff --git a/graphics/video/codecs/smc.h b/video/codecs/smc.h
index 158cffbce8..158cffbce8 100644
--- a/graphics/video/codecs/smc.h
+++ b/video/codecs/smc.h
diff --git a/graphics/video/codecs/truemotion1.cpp b/video/codecs/truemotion1.cpp
index 6ea766ffe1..6ea766ffe1 100644
--- a/graphics/video/codecs/truemotion1.cpp
+++ b/video/codecs/truemotion1.cpp
diff --git a/graphics/video/codecs/truemotion1.h b/video/codecs/truemotion1.h
index ab8fb221f8..ab8fb221f8 100644
--- a/graphics/video/codecs/truemotion1.h
+++ b/video/codecs/truemotion1.h
diff --git a/graphics/video/codecs/truemotion1data.h b/video/codecs/truemotion1data.h
index ce01178fd4..ce01178fd4 100644
--- a/graphics/video/codecs/truemotion1data.h
+++ b/video/codecs/truemotion1data.h
diff --git a/graphics/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index fdb244ddf2..fdb244ddf2 100644
--- a/graphics/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
diff --git a/graphics/video/coktel_decoder.h b/video/coktel_decoder.h
index e0c91533a3..e0c91533a3 100644
--- a/graphics/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
diff --git a/graphics/video/dxa_decoder.cpp b/video/dxa_decoder.cpp
index 3c52c0fc58..3c52c0fc58 100644
--- a/graphics/video/dxa_decoder.cpp
+++ b/video/dxa_decoder.cpp
diff --git a/graphics/video/dxa_decoder.h b/video/dxa_decoder.h
index a9a656e46d..a9a656e46d 100644
--- a/graphics/video/dxa_decoder.h
+++ b/video/dxa_decoder.h
diff --git a/graphics/video/flic_decoder.cpp b/video/flic_decoder.cpp
index 51c487861e..51c487861e 100644
--- a/graphics/video/flic_decoder.cpp
+++ b/video/flic_decoder.cpp
diff --git a/graphics/video/flic_decoder.h b/video/flic_decoder.h
index e403ff212a..e403ff212a 100644
--- a/graphics/video/flic_decoder.h
+++ b/video/flic_decoder.h
diff --git a/video/module.mk b/video/module.mk
new file mode 100644
index 0000000000..0172482dfa
--- /dev/null
+++ b/video/module.mk
@@ -0,0 +1,25 @@
+MODULE := video
+
+MODULE_OBJS := \
+ avi_decoder.o \
+ coktel_decoder.o \
+ dxa_decoder.o \
+ flic_decoder.o \
+ mpeg_player.o \
+ qt_decoder.o \
+ smk_decoder.o \
+ video_decoder.o \
+ codecs/cdtoons.o \
+ codecs/cinepak.o \
+ codecs/indeo3.o \
+ codecs/mjpeg.o \
+ codecs/msrle.o \
+ codecs/msvideo1.o \
+ codecs/qdm2.o \
+ codecs/qtrle.o \
+ codecs/rpza.o \
+ codecs/smc.o \
+ codecs/truemotion1.o
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/graphics/video/mpeg_player.cpp b/video/mpeg_player.cpp
index ea1fa4ec1c..ea1fa4ec1c 100644
--- a/graphics/video/mpeg_player.cpp
+++ b/video/mpeg_player.cpp
diff --git a/graphics/video/mpeg_player.h b/video/mpeg_player.h
index 4dedf12f57..4dedf12f57 100644
--- a/graphics/video/mpeg_player.h
+++ b/video/mpeg_player.h
diff --git a/graphics/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 9329966652..9329966652 100644
--- a/graphics/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
diff --git a/graphics/video/qt_decoder.h b/video/qt_decoder.h
index 186e257553..186e257553 100644
--- a/graphics/video/qt_decoder.h
+++ b/video/qt_decoder.h
diff --git a/graphics/video/smk_decoder.cpp b/video/smk_decoder.cpp
index e4d577acd2..e4d577acd2 100644
--- a/graphics/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
diff --git a/graphics/video/smk_decoder.h b/video/smk_decoder.h
index b441d1d64d..b441d1d64d 100644
--- a/graphics/video/smk_decoder.h
+++ b/video/smk_decoder.h
diff --git a/graphics/video/video_decoder.cpp b/video/video_decoder.cpp
index 81a8aecb30..81a8aecb30 100644
--- a/graphics/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
diff --git a/graphics/video/video_decoder.h b/video/video_decoder.h
index 402bcfe751..402bcfe751 100644
--- a/graphics/video/video_decoder.h
+++ b/video/video_decoder.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 01:24:09 +0000