From 9278fb81ed9603b92072e31a5915a8815a4c7c6a Mon Sep 17 00:00:00 2001
From: Laurent Aimar <fenrir@videolan.org>
Date: Sat, 16 May 2009 19:47:47 +0200
Subject: [PATCH] Do not uselessly include vlc_vout.h in decoders.

---
 modules/codec/avcodec/deinterlace.c | 1 -
 modules/codec/avcodec/encoder.c     | 1 -
 modules/codec/avcodec/video.c       | 1 -
 modules/codec/cc.c                  | 1 -
 modules/codec/cdg.c                 | 1 -
 modules/codec/csri.c                | 1 -
 modules/codec/cvdsub.c              | 1 -
 modules/codec/dirac.c               | 1 -
 modules/codec/dmo/buffer.c          | 1 -
 modules/codec/dmo/dmo.c             | 1 -
 modules/codec/dvbsub.c              | 1 -
 modules/codec/libass.c              | 1 -
 modules/codec/libmpeg2.c            | 1 -
 modules/codec/mash.cpp              | 1 -
 modules/codec/png.c                 | 1 -
 modules/codec/quicktime.c           | 1 -
 modules/codec/realvideo.c           | 1 -
 modules/codec/schroedinger.c        | 1 -
 modules/codec/sdl_image.c           | 1 -
 modules/codec/spudec/parse.c        | 1 -
 modules/codec/subtitles/subsdec.h   | 1 -
 modules/codec/subtitles/t140.c      | 1 -
 modules/codec/tarkin.c              | 1 -
 modules/codec/telx.c                | 1 -
 modules/codec/theora.c              | 1 -
 modules/codec/x264.c                | 1 -
 modules/codec/xvmc/xxmc.c           | 1 -
 modules/codec/zvbi.c                | 1 -
 28 files changed, 28 deletions(-)

diff --git a/modules/codec/avcodec/deinterlace.c b/modules/codec/avcodec/deinterlace.c
index 4b97455b15..9006346e08 100644
--- a/modules/codec/avcodec/deinterlace.c
+++ b/modules/codec/avcodec/deinterlace.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <vlc_filter.h>
 
 /* ffmpeg header */
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 44e2f6c9e9..86b44baea5 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_vout.h>
 #include <vlc_aout.h>
 #include <vlc_sout.h>
 #include <vlc_codec.h>
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 8b5d156614..8acbcaae89 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <vlc_codecs.h>                               /* BITMAPINFOHEADER */
 #include <vlc_avcodec.h>
 
diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index bf312fd967..59614a1617 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -39,7 +39,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_input.h>
 
diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c
index 974021ea7d..8b3d574e59 100644
--- a/modules/codec/cdg.c
+++ b/modules/codec/cdg.c
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor
diff --git a/modules/codec/csri.c b/modules/codec/csri.c
index d09e16a5c6..d7d7909bf9 100644
--- a/modules/codec/csri.c
+++ b/modules/codec/csri.c
@@ -34,7 +34,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_osd.h>
 #include <vlc_input.h>
diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c
index 0c08ce53a6..adec5547f4 100644
--- a/modules/codec/cvdsub.c
+++ b/modules/codec/cvdsub.c
@@ -33,7 +33,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 
 #include "vlc_bits.h"
diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 7e11878783..f24dd18b0e 100644
--- a/modules/codec/dirac.c
+++ b/modules/codec/dirac.c
@@ -41,7 +41,6 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>
-#include <vlc_vout.h>
 
 #include <libdirac_encoder/dirac_encoder.h>
 
diff --git a/modules/codec/dmo/buffer.c b/modules/codec/dmo/buffer.c
index 321709df21..5f66b58a81 100644
--- a/modules/codec/dmo/buffer.c
+++ b/modules/codec/dmo/buffer.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 
 #ifndef WIN32
 #    define LOADER
diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index 3875791fee..af33bc832e 100644
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -32,7 +32,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <vlc_aout.h>
 
 #ifndef WIN32
diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index dde87a00d6..3345eeb2e7 100644
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -45,7 +45,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>
 
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 7ae8c53da1..9dd811c70b 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -36,7 +36,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_osd.h>
 #include <vlc_input.h>
diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 36f55696d1..9863018d8b 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_block_helper.h>
 #include "../codec/cc.h"
diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp
index f6dbc3a70a..d4dac48059 100644
--- a/modules/codec/mash.cpp
+++ b/modules/codec/mash.cpp
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <vlc_block.h>
 
 #include <p64/p64.h>
diff --git a/modules/codec/png.c b/modules/codec/png.c
index 4b48843523..3d8a6ff9fd 100644
--- a/modules/codec/png.c
+++ b/modules/codec/png.c
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <png.h>
 
 /*****************************************************************************
diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index 976c8c7202..9ae170295d 100644
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -33,7 +33,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 
 #if !defined (__APPLE__) && !defined(WIN32)
diff --git a/modules/codec/realvideo.c b/modules/codec/realvideo.c
index c890681045..5ac53bf875 100644
--- a/modules/codec/realvideo.c
+++ b/modules/codec/realvideo.c
@@ -28,7 +28,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 
 #ifdef LOADER
diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c
index bc08984c7f..162fd8ba95 100644
--- a/modules/codec/schroedinger.c
+++ b/modules/codec/schroedinger.c
@@ -35,7 +35,6 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>
-#include <vlc_vout.h>
 
 #include <schroedinger/schro.h>
 
diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c
index 1258238017..6ce6baa940 100644
--- a/modules/codec/sdl_image.c
+++ b/modules/codec/sdl_image.c
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 
 #include SDL_IMAGE_INCLUDE_FILE
 
diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c
index 0a572d9e74..e5ac8514b2 100644
--- a/modules/codec/spudec/parse.c
+++ b/modules/codec/spudec/parse.c
@@ -31,7 +31,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_input.h>
 
diff --git a/modules/codec/subtitles/subsdec.h b/modules/codec/subtitles/subsdec.h
index 2c221ca95d..0ab39b748a 100644
--- a/modules/codec/subtitles/subsdec.h
+++ b/modules/codec/subtitles/subsdec.h
@@ -28,7 +28,6 @@
 #define SUBSDEC_HEADER_H
 
 #include <vlc_common.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_input.h>
 
diff --git a/modules/codec/subtitles/t140.c b/modules/codec/subtitles/t140.c
index 6eee0142ec..1c3f6e7348 100644
--- a/modules/codec/subtitles/t140.c
+++ b/modules/codec/subtitles/t140.c
@@ -25,7 +25,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>
 
diff --git a/modules/codec/tarkin.c b/modules/codec/tarkin.c
index 20e5d94627..f0327413ff 100644
--- a/modules/codec/tarkin.c
+++ b/modules/codec/tarkin.c
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <ogg/ogg.h>
 
 /* FIXME */
diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index 9f2c263008..59bd7f0d46 100644
--- a/modules/codec/telx.c
+++ b/modules/codec/telx.c
@@ -34,7 +34,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
-#include "vlc_vout.h"
 #include "vlc_bits.h"
 #include "vlc_codec.h"
 
diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index dda5000b3e..934c6839e5 100644
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -31,7 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_vout.h>
 #include <vlc_sout.h>
 #include <vlc_input.h>
 #include <ogg/ogg.h>
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 2a82903f4f..93df88d895 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -30,7 +30,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_sout.h>
 #include <vlc_codec.h>
 
diff --git a/modules/codec/xvmc/xxmc.c b/modules/codec/xvmc/xxmc.c
index 87e3fff406..19b238b9fb 100644
--- a/modules/codec/xvmc/xxmc.c
+++ b/modules/codec/xvmc/xxmc.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_codec_synchro.h>
 
diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 3563a66406..26672f2c94 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -46,7 +46,6 @@
 #include <assert.h>
 #include <libzvbi.h>
 
-#include <vlc_vout.h>
 #include <vlc_codec.h>
 #include <vlc_osd.h>
 
-- 
2.39.5