[Scummvm-cvs-logs] SF.net SVN: scummvm:[55474] scummvm/trunk

sev at users.sourceforge.net sev at users.sourceforge.net
Sun Jan 23 18:37:18 CET 2011


Revision: 55474
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55474&view=rev
Author:   sev
Date:     2011-01-23 17:37:17 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
GRAPHICS: Move graphics/video/ to video/. Step 2/2

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/animation.h
    scummvm/trunk/video/avi_decoder.cpp
    scummvm/trunk/video/avi_decoder.h
    scummvm/trunk/video/codecs/cdtoons.cpp
    scummvm/trunk/video/codecs/cdtoons.h
    scummvm/trunk/video/codecs/cinepak.cpp
    scummvm/trunk/video/codecs/cinepak.h
    scummvm/trunk/video/codecs/codec.h
    scummvm/trunk/video/codecs/indeo3.cpp
    scummvm/trunk/video/codecs/indeo3.h
    scummvm/trunk/video/codecs/mjpeg.cpp
    scummvm/trunk/video/codecs/mjpeg.h
    scummvm/trunk/video/codecs/msrle.cpp
    scummvm/trunk/video/codecs/msrle.h
    scummvm/trunk/video/codecs/msvideo1.cpp
    scummvm/trunk/video/codecs/msvideo1.h
    scummvm/trunk/video/codecs/qdm2.cpp
    scummvm/trunk/video/codecs/qdm2.h
    scummvm/trunk/video/codecs/qdm2data.h
    scummvm/trunk/video/codecs/qtrle.cpp
    scummvm/trunk/video/codecs/qtrle.h
    scummvm/trunk/video/codecs/rpza.cpp
    scummvm/trunk/video/codecs/rpza.h
    scummvm/trunk/video/codecs/smc.cpp
    scummvm/trunk/video/codecs/smc.h
    scummvm/trunk/video/codecs/truemotion1.cpp
    scummvm/trunk/video/codecs/truemotion1.h
    scummvm/trunk/video/codecs/truemotion1data.h
    scummvm/trunk/video/coktel_decoder.cpp
    scummvm/trunk/video/coktel_decoder.h
    scummvm/trunk/video/dxa_decoder.cpp
    scummvm/trunk/video/dxa_decoder.h
    scummvm/trunk/video/flic_decoder.cpp
    scummvm/trunk/video/flic_decoder.h
    scummvm/trunk/video/mpeg_player.cpp
    scummvm/trunk/video/mpeg_player.h
    scummvm/trunk/video/qt_decoder.cpp
    scummvm/trunk/video/qt_decoder.h
    scummvm/trunk/video/smk_decoder.cpp
    scummvm/trunk/video/smk_decoder.h
    scummvm/trunk/video/video_decoder.cpp
    scummvm/trunk/video/video_decoder.h

Modified: scummvm/trunk/engines/sword2/animation.h
===================================================================
--- scummvm/trunk/engines/sword2/animation.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/engines/sword2/animation.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -28,9 +28,9 @@
 #ifndef SWORD2_ANIMATION_H
 #define SWORD2_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 "sound/mixer.h"
 
 #include "sword2/screen.h"

Modified: scummvm/trunk/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/video/avi_decoder.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/avi_decoder.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -31,18 +31,18 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
-#include "graphics/video/avi_decoder.h"
+#include "video/avi_decoder.h"
 
 // Audio Codecs
 #include "sound/decoders/adpcm.h"
 #include "sound/decoders/raw.h"
 
 // Video Codecs
-#include "graphics/video/codecs/cinepak.h"
-#include "graphics/video/codecs/indeo3.h"
-#include "graphics/video/codecs/msvideo1.h"
-#include "graphics/video/codecs/msrle.h"
-#include "graphics/video/codecs/truemotion1.h"
+#include "video/codecs/cinepak.h"
+#include "video/codecs/indeo3.h"
+#include "video/codecs/msvideo1.h"
+#include "video/codecs/msrle.h"
+#include "video/codecs/truemotion1.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/avi_decoder.h
===================================================================
--- scummvm/trunk/video/avi_decoder.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/avi_decoder.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef GRAPHICS_AVI_PLAYER_H
-#define GRAPHICS_AVI_PLAYER_H
+#ifndef VIDEO_AVI_PLAYER_H
+#define VIDEO_AVI_PLAYER_H
 
-#include "graphics/video/video_decoder.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/video_decoder.h"
+#include "video/codecs/codec.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 

Modified: scummvm/trunk/video/codecs/cdtoons.cpp
===================================================================
--- scummvm/trunk/video/codecs/cdtoons.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/cdtoons.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/codecs/cdtoons.h"
+#include "video/codecs/cdtoons.h"
 #include "common/stream.h"
 
 #include "common/system.h"

Modified: scummvm/trunk/video/codecs/cdtoons.h
===================================================================
--- scummvm/trunk/video/codecs/cdtoons.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/cdtoons.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_CDTOONS_H
-#define GRAPHICS_VIDEO_CDTOONS_H
+#ifndef VIDEO_CODECS_CDTOONS_H
+#define VIDEO_CODECS_CDTOONS_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 #include "common/hashmap.h"
 

Modified: scummvm/trunk/video/codecs/cinepak.cpp
===================================================================
--- scummvm/trunk/video/codecs/cinepak.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/cinepak.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/codecs/cinepak.h"
+#include "video/codecs/cinepak.h"
 
 #include "common/system.h"
 

Modified: scummvm/trunk/video/codecs/cinepak.h
===================================================================
--- scummvm/trunk/video/codecs/cinepak.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/cinepak.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_CINEPAK_H
-#define GRAPHICS_CINEPAK_H
+#ifndef VIDEO_CODECS_CINEPAK_H
+#define VIDEO_CODECS_CINEPAK_H
 
 #include "common/scummsys.h"
 #include "common/stream.h"
@@ -32,7 +32,7 @@
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/codec.h
===================================================================
--- scummvm/trunk/video/codecs/codec.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/codec.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_CODEC_H
-#define GRAPHICS_CODEC_H
+#ifndef VIDEO_CODECS_CODEC_H
+#define VIDEO_CODECS_CODEC_H
 
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"

Modified: scummvm/trunk/video/codecs/indeo3.cpp
===================================================================
--- scummvm/trunk/video/codecs/indeo3.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/indeo3.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -40,7 +40,7 @@
 
 #include "graphics/conversion.h"
 
-#include "graphics/video/codecs/indeo3.h"
+#include "video/codecs/indeo3.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/indeo3.h
===================================================================
--- scummvm/trunk/video/codecs/indeo3.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/indeo3.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -34,10 +34,10 @@
  * written, produced, and directed by Alan Smithee
  */
 
-#ifndef GRAPHICS_INDEO3_H
-#define GRAPHICS_INDEO3_H
+#ifndef VIDEO_CODECS_INDEO3_H
+#define VIDEO_CODECS_INDEO3_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
@@ -89,6 +89,6 @@
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_INDEO3_H
+#endif // VIDEO_CODECS_INDEO3_H
 
 #endif // USE_INDEO3

Modified: scummvm/trunk/video/codecs/mjpeg.cpp
===================================================================
--- scummvm/trunk/video/codecs/mjpeg.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/mjpeg.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -26,7 +26,7 @@
 #include "common/system.h"
 #include "graphics/conversion.h" // For YUV2RGB
 
-#include "graphics/video/codecs/mjpeg.h"
+#include "video/codecs/mjpeg.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/mjpeg.h
===================================================================
--- scummvm/trunk/video/codecs/mjpeg.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/mjpeg.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,12 +23,12 @@
  *
  */
 
-#ifndef GRAPHICS_MJPEG_H
-#define GRAPHICS_MJPEG_H
+#ifndef VIDEO_CODECS_MJPEG_H
+#define VIDEO_CODECS_MJPEG_H
 
 #include "common/scummsys.h"
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 #include "graphics/jpeg.h"
 #include "graphics/pixelformat.h"
 

Modified: scummvm/trunk/video/codecs/msrle.cpp
===================================================================
--- scummvm/trunk/video/codecs/msrle.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/msrle.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -25,7 +25,7 @@
 
 // Based off ffmpeg's msrledec.c
 
-#include "graphics/video/codecs/msrle.h"
+#include "video/codecs/msrle.h"
 #include "common/stream.h"
 
 namespace Graphics {

Modified: scummvm/trunk/video/codecs/msrle.h
===================================================================
--- scummvm/trunk/video/codecs/msrle.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/msrle.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_MSRLE_H
-#define GRAPHICS_MSRLE_H
+#ifndef VIDEO_CODECS_MSRLE_H
+#define VIDEO_CODECS_MSRLE_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/msvideo1.cpp
===================================================================
--- scummvm/trunk/video/codecs/msvideo1.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/msvideo1.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -25,7 +25,7 @@
 
  // Based off ffmpeg's msvideo.cpp
 
-#include "graphics/video/codecs/msvideo1.h"
+#include "video/codecs/msvideo1.h"
 #include "common/stream.h"
 
 namespace Graphics {

Modified: scummvm/trunk/video/codecs/msvideo1.h
===================================================================
--- scummvm/trunk/video/codecs/msvideo1.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/msvideo1.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_MSVIDEO1_H
-#define GRAPHICS_MSVIDEO1_H
+#ifndef VIDEO_CODECS_MSVIDEO1_H
+#define VIDEO_CODECS_MSVIDEO1_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/qdm2.cpp
===================================================================
--- scummvm/trunk/video/codecs/qdm2.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/qdm2.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -26,12 +26,12 @@
 // Based off ffmpeg's QDM2 decoder
 
 #include "common/scummsys.h"
-#include "graphics/video/codecs/qdm2.h"
+#include "video/codecs/qdm2.h"
 
 #ifdef GRAPHICS_QDM2_H
 
 #include "sound/audiostream.h"
-#include "graphics/video/codecs/qdm2data.h"
+#include "video/codecs/qdm2data.h"
 
 #include "common/array.h"
 #include "common/stream.h"

Modified: scummvm/trunk/video/codecs/qdm2.h
===================================================================
--- scummvm/trunk/video/codecs/qdm2.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/qdm2.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -26,8 +26,8 @@
 // Only compile if Mohawk is enabled or if we're building dynamic modules
 #if defined(ENABLE_MOHAWK) || defined(DYNAMIC_MODULES)
 
-#ifndef GRAPHICS_QDM2_H
-#define GRAPHICS_QDM2_H
+#ifndef VIDEO_CODECS_QDM2_H
+#define VIDEO_CODECS_QDM2_H
 
 namespace Common {
 	class SeekableReadStream;
@@ -50,5 +50,5 @@
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_QDM2_H
+#endif // VIDEO_CODECS_QDM2_H
 #endif // Mohawk/Plugins guard

Modified: scummvm/trunk/video/codecs/qdm2data.h
===================================================================
--- scummvm/trunk/video/codecs/qdm2data.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/qdm2data.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_QDM2DATA_H
-#define GRAPHICS_QDM2DATA_H
+#ifndef VIDEO_CODECS_QDM2DATA_H
+#define VIDEO_CODECS_QDM2DATA_H
 
 #include "common/scummsys.h"
 

Modified: scummvm/trunk/video/codecs/qtrle.cpp
===================================================================
--- scummvm/trunk/video/codecs/qtrle.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/qtrle.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -26,7 +26,7 @@
 // QuickTime RLE Decoder
 // Based off ffmpeg's QuickTime RLE decoder (written by Mike Melanson)
 
-#include "graphics/video/codecs/qtrle.h"
+#include "video/codecs/qtrle.h"
 
 #include "common/scummsys.h"
 #include "common/stream.h"

Modified: scummvm/trunk/video/codecs/qtrle.h
===================================================================
--- scummvm/trunk/video/codecs/qtrle.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/qtrle.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_QTRLE_H
-#define GRAPHICS_VIDEO_QTRLE_H
+#ifndef VIDEO_CODECS_QTRLE_H
+#define VIDEO_CODECS_QTRLE_H
 
 #include "graphics/pixelformat.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/rpza.cpp
===================================================================
--- scummvm/trunk/video/codecs/rpza.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/rpza.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -25,7 +25,7 @@
 
  // Based off ffmpeg's RPZA decoder
 
-#include "graphics/video/codecs/rpza.h"
+#include "video/codecs/rpza.h"
 
 #include "common/system.h"
 #include "common/stream.h"

Modified: scummvm/trunk/video/codecs/rpza.h
===================================================================
--- scummvm/trunk/video/codecs/rpza.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/rpza.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_RPZA_H
-#define GRAPHICS_VIDEO_RPZA_H
+#ifndef VIDEO_CODECS_RPZA_H
+#define VIDEO_CODECS_RPZA_H
 
 #include "graphics/pixelformat.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/smc.cpp
===================================================================
--- scummvm/trunk/video/codecs/smc.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/smc.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -25,7 +25,7 @@
 
 // Based off ffmpeg's SMC decoder
 
-#include "graphics/video/codecs/smc.h"
+#include "video/codecs/smc.h"
 #include "common/stream.h"
 
 namespace Graphics {

Modified: scummvm/trunk/video/codecs/smc.h
===================================================================
--- scummvm/trunk/video/codecs/smc.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/smc.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_SMC_H
-#define GRAPHICS_VIDEO_SMC_H
+#ifndef VIDEO_CODECS_SMC_H
+#define VIDEO_CODECS_SMC_H
 
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/codecs/truemotion1.cpp
===================================================================
--- scummvm/trunk/video/codecs/truemotion1.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/truemotion1.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -26,11 +26,11 @@
 // Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg
 
 #include "common/scummsys.h"
-#include "graphics/video/codecs/truemotion1.h"
+#include "video/codecs/truemotion1.h"
 
-#ifdef GRAPHICS_TRUEMOTION1_H
+#ifdef VIDEO_CODECS_TRUEMOTION1_H
 
-#include "graphics/video/codecs/truemotion1data.h"
+#include "video/codecs/truemotion1data.h"
 #include "common/stream.h"
 
 namespace Graphics {

Modified: scummvm/trunk/video/codecs/truemotion1.h
===================================================================
--- scummvm/trunk/video/codecs/truemotion1.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/truemotion1.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -28,10 +28,10 @@
 // Only compile if SCI32 is enabled or if we're building dynamic modules
 #if defined(ENABLE_SCI32) || defined(DYNAMIC_MODULES)
 
-#ifndef GRAPHICS_TRUEMOTION1_H
-#define GRAPHICS_TRUEMOTION1_H
+#ifndef VIDEO_CODECS_TRUEMOTION1_H
+#define VIDEO_CODECS_TRUEMOTION1_H
  
-#include "graphics/video/codecs/codec.h"
+#include "video/codecs/codec.h"
 
 namespace Graphics {
 
@@ -102,5 +102,5 @@
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_TRUEMOTION1_H
+#endif // VIDEO_CODECS_TRUEMOTION1_H
 #endif // SCI32/Plugins guard

Modified: scummvm/trunk/video/codecs/truemotion1data.h
===================================================================
--- scummvm/trunk/video/codecs/truemotion1data.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/codecs/truemotion1data.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -26,8 +26,8 @@
 // Based on the TrueMotion 1 decoder by Alex Beregszaszi & Mike Melanson in FFmpeg
 // These tables were originally part of VpVision from On2
 
-#ifndef GRAPHICS_TRUEMOTION1DATA_H
-#define GRAPHICS_TRUEMOTION1DATA_H
+#ifndef VIDEO_CODECS_TRUEMOTION1DATA_H
+#define VIDEO_CODECS_TRUEMOTION1DATA_H
 
 #include "common/scummsys.h"
 

Modified: scummvm/trunk/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/video/coktel_decoder.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/coktel_decoder.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -25,12 +25,12 @@
 
 #include "common/scummsys.h"
 
-#include "graphics/video/coktel_decoder.h"
+#include "video/coktel_decoder.h"
 
-#include "graphics/video/codecs/codec.h"
-#include "graphics/video/codecs/indeo3.h"
+#include "video/codecs/codec.h"
+#include "video/codecs/indeo3.h"
 
-#ifdef GRAPHICS_VIDEO_COKTELDECODER_H
+#ifdef VIDEO_COKTELDECODER_H
 
 #include "sound/audiostream.h"
 #include "sound/decoders/raw.h"
@@ -2754,4 +2754,4 @@
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_VIDEO_COKTELDECODER_H
+#endif // VIDEO_COKTELDECODER_H

Modified: scummvm/trunk/video/coktel_decoder.h
===================================================================
--- scummvm/trunk/video/coktel_decoder.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/coktel_decoder.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -30,14 +30,14 @@
 
 #else
 
-#ifndef GRAPHICS_VIDEO_COKTELDECODER_H
-#define GRAPHICS_VIDEO_COKTELDECODER_H
+#ifndef VIDEO_COKTELDECODER_H
+#define VIDEO_COKTELDECODER_H
 
 #include "common/list.h"
 #include "common/array.h"
 #include "common/rect.h"
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 
 #include "sound/mixer.h"
 
@@ -515,6 +515,6 @@
 
 } // End of namespace Graphics
 
-#endif // GRAPHICS_VIDEO_COKTELDECODER_H
+#endif // VIDEO_COKTELDECODER_H
 
 #endif // Engine and dynamic plugins guard

Modified: scummvm/trunk/video/dxa_decoder.cpp
===================================================================
--- scummvm/trunk/video/dxa_decoder.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/dxa_decoder.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -30,7 +30,7 @@
 #include "common/stream.h"
 #include "common/util.h"
 
-#include "graphics/video/dxa_decoder.h"
+#include "video/dxa_decoder.h"
 
 #ifdef USE_ZLIB
   #include "common/zlib.h"

Modified: scummvm/trunk/video/dxa_decoder.h
===================================================================
--- scummvm/trunk/video/dxa_decoder.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/dxa_decoder.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_DXA_PLAYER_H
-#define GRAPHICS_VIDEO_DXA_PLAYER_H
+#ifndef VIDEO_DXA_DECODER_H
+#define VIDEO_DXA_DECODER_H
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/flic_decoder.cpp
===================================================================
--- scummvm/trunk/video/flic_decoder.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/flic_decoder.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/flic_decoder.h"
+#include "video/flic_decoder.h"
 #include "common/archive.h"
 #include "common/stream.h"
 #include "common/endian.h"

Modified: scummvm/trunk/video/flic_decoder.h
===================================================================
--- scummvm/trunk/video/flic_decoder.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/flic_decoder.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_FLICDECODER_H
-#define GRAPHICS_VIDEO_FLICDECODER_H
+#ifndef VIDEO_FLICDECODER_H
+#define VIDEO_FLICDECODER_H
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 #include "common/list.h"
 #include "common/rect.h"
 

Modified: scummvm/trunk/video/mpeg_player.cpp
===================================================================
--- scummvm/trunk/video/mpeg_player.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/mpeg_player.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -86,7 +86,7 @@
 // BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
 // SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-#include "graphics/video/mpeg_player.h"
+#include "video/mpeg_player.h"
 #include "common/file.h"
 #include "common/system.h"
 #include "common/util.h"

Modified: scummvm/trunk/video/mpeg_player.h
===================================================================
--- scummvm/trunk/video/mpeg_player.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/mpeg_player.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_MPEG_PLAYER_H
-#define GRAPHICS_VIDEO_MPEG_PLAYER_H
+#ifndef VIDEO_MPEG_PLAYER_H
+#define VIDEO_MPEG_PLAYER_H
 
 #include "common/scummsys.h"
 #include "graphics/pixelformat.h"

Modified: scummvm/trunk/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/video/qt_decoder.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/qt_decoder.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -31,7 +31,7 @@
 // Seek function by Gael Chardon gael.dev at 4now.net
 //
 
-#include "graphics/video/qt_decoder.h"
+#include "video/qt_decoder.h"
 
 #include "common/debug.h"
 #include "common/endian.h"
@@ -43,15 +43,15 @@
 // Audio codecs
 #include "sound/decoders/adpcm.h"
 #include "sound/decoders/raw.h"
-#include "graphics/video/codecs/qdm2.h"
+#include "video/codecs/qdm2.h"
 
 // Video codecs
-#include "graphics/video/codecs/cinepak.h"
-#include "graphics/video/codecs/mjpeg.h"
-#include "graphics/video/codecs/qtrle.h"
-#include "graphics/video/codecs/rpza.h"
-#include "graphics/video/codecs/smc.h"
-#include "graphics/video/codecs/cdtoons.h"
+#include "video/codecs/cinepak.h"
+#include "video/codecs/mjpeg.h"
+#include "video/codecs/qtrle.h"
+#include "video/codecs/rpza.h"
+#include "video/codecs/smc.h"
+#include "video/codecs/cdtoons.h"
 
 namespace Graphics {
 

Modified: scummvm/trunk/video/qt_decoder.h
===================================================================
--- scummvm/trunk/video/qt_decoder.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/qt_decoder.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -31,15 +31,15 @@
 // Seek function by Gael Chardon gael.dev at 4now.net
 //
 
-#ifndef GRAPHICS_QT_DECODER_H
-#define GRAPHICS_QT_DECODER_H
+#ifndef VIDEO_QT_DECODER_H
+#define VIDEO_QT_DECODER_H
 
 #include "common/scummsys.h"
 #include "common/queue.h"
 #include "common/rational.h"
 
-#include "graphics/video/video_decoder.h"
-#include "graphics/video/codecs/codec.h"
+#include "video/video_decoder.h"
+#include "video/codecs/codec.h"
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"

Modified: scummvm/trunk/video/smk_decoder.cpp
===================================================================
--- scummvm/trunk/video/smk_decoder.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/smk_decoder.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -27,7 +27,7 @@
 // and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143
 // http://git.ffmpeg.org/?p=ffmpeg;a=blob;f=libavcodec/smacker.c;hb=b8437a00a2f14d4a437346455d624241d726128e
 
-#include "graphics/video/smk_decoder.h"
+#include "video/smk_decoder.h"
 
 #include "common/archive.h"
 #include "common/endian.h"

Modified: scummvm/trunk/video/smk_decoder.h
===================================================================
--- scummvm/trunk/video/smk_decoder.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/smk_decoder.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_SMK_PLAYER_H
-#define GRAPHICS_VIDEO_SMK_PLAYER_H
+#ifndef VIDEO_SMK_PLAYER_H
+#define VIDEO_SMK_PLAYER_H
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 #include "sound/mixer.h"
 
 namespace Audio {

Modified: scummvm/trunk/video/video_decoder.cpp
===================================================================
--- scummvm/trunk/video/video_decoder.cpp	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/video_decoder.cpp	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,7 +23,7 @@
  *
  */
 
-#include "graphics/video/video_decoder.h"
+#include "video/video_decoder.h"
 
 #include "common/file.h"
 #include "common/system.h"

Modified: scummvm/trunk/video/video_decoder.h
===================================================================
--- scummvm/trunk/video/video_decoder.h	2011-01-23 17:14:43 UTC (rev 55473)
+++ scummvm/trunk/video/video_decoder.h	2011-01-23 17:37:17 UTC (rev 55474)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef GRAPHICS_VIDEO_DECODER_H
-#define GRAPHICS_VIDEO_DECODER_H
+#ifndef VIDEO_DECODER_H
+#define VIDEO_DECODER_H
 
 #include "common/events.h"
 #include "common/list.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list