aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorFilippos Karapetis2009-05-21 13:02:56 +0000
committerFilippos Karapetis2009-05-21 13:02:56 +0000
commitb7f8990ba81f81db3243ae3f9069c4d9f12754aa (patch)
tree50f84f9e502bad1274f684b9c534144f4c6e9a88 /graphics
parentf583a10ec97b3f4ada56ed5e296d4143a4e10e30 (diff)
downloadscummvm-rg350-b7f8990ba81f81db3243ae3f9069c4d9f12754aa.tar.gz
scummvm-rg350-b7f8990ba81f81db3243ae3f9069c4d9f12754aa.tar.bz2
scummvm-rg350-b7f8990ba81f81db3243ae3f9069c4d9f12754aa.zip
Renamed the DXA, SMK and FLIC video decoders to reflect the fact that they're decoders, not players
svn-id: r40759
Diffstat (limited to 'graphics')
-rw-r--r--graphics/module.mk6
-rw-r--r--graphics/video/dxa_decoder.cpp (renamed from graphics/video/dxa_player.cpp)2
-rw-r--r--graphics/video/dxa_decoder.h (renamed from graphics/video/dxa_player.h)0
-rw-r--r--graphics/video/flic_decoder.cpp (renamed from graphics/video/flic_player.cpp)2
-rw-r--r--graphics/video/flic_decoder.h (renamed from graphics/video/flic_player.h)0
-rw-r--r--graphics/video/smk_decoder.cpp (renamed from graphics/video/smk_player.cpp)2
-rw-r--r--graphics/video/smk_decoder.h (renamed from graphics/video/smk_player.h)0
7 files changed, 6 insertions, 6 deletions
diff --git a/graphics/module.mk b/graphics/module.mk
index 7eef6ba258..bf93822bee 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -18,10 +18,10 @@ MODULE_OBJS := \
thumbnail.o \
VectorRenderer.o \
VectorRendererSpec.o \
- video/dxa_player.o \
- video/flic_player.o \
+ video/dxa_decoder.o \
+ video/flic_decoder.o \
video/mpeg_player.o \
- video/smk_player.o \
+ video/smk_decoder.o \
video/video_player.o \
video/coktelvideo/indeo3.o \
video/coktelvideo/coktelvideo.o
diff --git a/graphics/video/dxa_player.cpp b/graphics/video/dxa_decoder.cpp
index d0d4d1c67b..e514050942 100644
--- a/graphics/video/dxa_player.cpp
+++ b/graphics/video/dxa_decoder.cpp
@@ -29,7 +29,7 @@
#include "common/system.h"
#include "common/util.h"
-#include "graphics/video/dxa_player.h"
+#include "graphics/video/dxa_decoder.h"
#ifdef USE_ZLIB
#include "common/zlib.h"
diff --git a/graphics/video/dxa_player.h b/graphics/video/dxa_decoder.h
index 384a057c3f..384a057c3f 100644
--- a/graphics/video/dxa_player.h
+++ b/graphics/video/dxa_decoder.h
diff --git a/graphics/video/flic_player.cpp b/graphics/video/flic_decoder.cpp
index e58cf0bdbc..bef232b6e6 100644
--- a/graphics/video/flic_player.cpp
+++ b/graphics/video/flic_decoder.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "graphics/video/flic_player.h"
+#include "graphics/video/flic_decoder.h"
#include "common/archive.h"
#include "common/stream.h"
#include "common/endian.h"
diff --git a/graphics/video/flic_player.h b/graphics/video/flic_decoder.h
index 68bf3fb688..68bf3fb688 100644
--- a/graphics/video/flic_player.h
+++ b/graphics/video/flic_decoder.h
diff --git a/graphics/video/smk_player.cpp b/graphics/video/smk_decoder.cpp
index ebbf61d25a..3d83bbd8ea 100644
--- a/graphics/video/smk_player.cpp
+++ b/graphics/video/smk_decoder.cpp
@@ -27,7 +27,7 @@
// and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143
// http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup
-#include "graphics/video/smk_player.h"
+#include "graphics/video/smk_decoder.h"
#include "common/archive.h"
#include "common/array.h"
diff --git a/graphics/video/smk_player.h b/graphics/video/smk_decoder.h
index e70d0e6454..e70d0e6454 100644
--- a/graphics/video/smk_player.h
+++ b/graphics/video/smk_decoder.h