aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2011-01-23 17:14:43 +0000
committerEugene Sandulenko2011-01-23 17:14:43 +0000
commit806ccf5d25ebe337103942cdb6b5cf8800de115a (patch)
treeead210f06163f97521b2ae26b06b450be8bf10a3 /engines
parent36ed9be335217ef6fcf8e07b257fb6a1ee1ed8f2 (diff)
downloadscummvm-rg350-806ccf5d25ebe337103942cdb6b5cf8800de115a.tar.gz
scummvm-rg350-806ccf5d25ebe337103942cdb6b5cf8800de115a.tar.bz2
scummvm-rg350-806ccf5d25ebe337103942cdb6b5cf8800de115a.zip
GRAPHICS: Move graphics/video/ to video/. Step 1/2
svn-id: r55473
Diffstat (limited to 'engines')
-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
13 files changed, 19 insertions, 19 deletions
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"