Removed now useless vlc_osd.h includes.

diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index 8b474481e5253e0b3a854f645c602e9716323d44..20284b2cd8bb33cfee8b46cec243092b3b80e14d 100644 (file)
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -32,7 +32,6 @@
 #include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_avcodec.h>
-#include <vlc_osd.h>
 
 /* ffmpeg header */
 #ifdef HAVE_LIBAVCODEC_AVCODEC_H

diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 237d875ea66f692c36db26014b574a479774689f..ee20e50d5e28faa6cd46b0a3d026b450f67e9ae2 100644 (file)
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -42,7 +42,6 @@
 #include <vlc_codec.h>
 #include <vlc_input.h>
 
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 #include <vlc_image.h>
 #include <vlc_charset.h>

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index ee12f48b396f85565fa0dbeda8ccbb1b7168d4bb..7f697bdf8759d288bae5a1b60e8ccffd00cd6baf 100644 (file)
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -32,7 +32,6 @@
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
 #include "../demux/xiph.h"
 
 #include <kate/kate.h>

diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index d98d34db046f78a751a64cabcce42c0067e1e0fd..77e66bcb9b4351d95a20dc51d77f3581c9f4d43d 100644 (file)
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -37,7 +37,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
 #include <vlc_input.h>
 #include <vlc_dialog.h>
 

diff --git a/modules/codec/subtitles/subsdec.h b/modules/codec/subtitles/subsdec.h
index 11db067373f8c809864efcf0c38166461d9d25a8..aaf307dd1b4bcd72627cdd9836c9a79e6d797dad 100644 (file)
--- a/modules/codec/subtitles/subsdec.h
+++ b/modules/codec/subtitles/subsdec.h
@@ -31,7 +31,6 @@
 #include <vlc_codec.h>
 #include <vlc_input.h>
 
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 #include <vlc_image.h>
 #include <vlc_charset.h>

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index c8210d1146ff0843ea17591a92fee1b07685dccf..7751e82044b434c8824ce34dbed4ac359efe2ff8 100644 (file)
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -34,7 +34,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
 #include <vlc_bits.h>
 
 /*****************************************************************************

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 75ae69bef15515ceb037c3d01b0ff083cc1bb85c..720eb6430d92370a2680b82a6b46a1370b88d737 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -47,7 +47,7 @@
 #include <libzvbi.h>
 
 #include <vlc_codec.h>
-#include <vlc_osd.h>
+#include <vlc_vout_osd.h>
 
 /*****************************************************************************
  * Module descriptor.

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index e8f9bbfc3c89a320a03016494df9d671845bef68..5fc41fd4556cebfa026b1e23db02f88be9c1ed2d 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -33,7 +33,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 #include <vlc_stream.h>
 #include <vlc_xml.h>

diff --git a/modules/stream_out/transcode/osd.c b/modules/stream_out/transcode/osd.c
index 4424f6ecd75edcc327ccb792c83681c6d2ed792d..24485416e4750e1c930b09e5893201caa3eb4ace 100644 (file)
--- a/modules/stream_out/transcode/osd.c
+++ b/modules/stream_out/transcode/osd.c
@@ -30,7 +30,7 @@
 
 #include "transcode.h"
 
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 
 /*
  * OSD menu

diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index 95db5e2daf449568edd831bc894900fcdfec458a..c53a3c2eef5f3025c6df020ebd6e8ae18beef18b 100644 (file)
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -31,7 +31,7 @@
 #include "transcode.h"
 
 #include <vlc_meta.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 #include <assert.h>
 
 static subpicture_t *spu_new_buffer( decoder_t *p_dec,

diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 724a44da9531675522b1c00e852203af46603eca..3d4a846bdddb2ab7c66ecd8c30d86399c288e3d5 100644 (file)
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -34,7 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 
 #include "transcode.h"
 

diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 7a1dd8a8774730663fa68de75339090245ade80e..246d4eaa95e662b550d638dcf113f4708e93c9d9 100644 (file)
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -31,7 +31,7 @@
 #include "transcode.h"
 
 #include <vlc_meta.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 
 #define ENC_FRAMERATE (25 * 1000 + .5)
 #define ENC_FRAMERATE_BASE 1000

diff --git a/modules/video_filter/audiobargraph_v.c b/modules/video_filter/audiobargraph_v.c
index 3d16738ec9d5c25d1986e3502822d7bf52a0c70b..156b0ec1747981e961e184c0fffe10556d0ad8a6 100644 (file)
--- a/modules/video_filter/audiobargraph_v.c
+++ b/modules/video_filter/audiobargraph_v.c
@@ -35,7 +35,6 @@
 #include <vlc_filter.h>
 
 #include <vlc_image.h>
-#include <vlc_osd.h>
 
 #ifdef LoadImage
 #   undef LoadImage

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 6db8e4d67c52c233748f866382f70ab56a9fd5a2..c15f1e36483d4778bfe434ad99f4fb320f369f2e 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -36,7 +36,6 @@
 #include <vlc_filter.h>
 
 #include <vlc_image.h>
-#include <vlc_osd.h>
 
 #ifdef LoadImage
 #   undef LoadImage

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index 3365530a77a3809676ebe319bd5e2300947b4055..e13beb0cc31e44d0f32c01551ba7f8945ac295cb 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -36,7 +36,6 @@
 
 #include <vlc_filter.h>
 #include <vlc_block.h>
-#include <vlc_osd.h>
 
 #include <vlc_strings.h>
 

diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index 97dfe004eebc83ce78ef55068ea4fddeba834ebd..f11ec0798acdfa21ecc3551bd4758d367c0b4816 100644 (file)
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -56,7 +56,6 @@
 
 #include <vlc_filter.h>
 #include <vlc_image.h>
-#include <vlc_osd.h>
 #include <vlc_keys.h>
 
 #include <vlc_network.h>

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 91c573c5c06c47b5eb791529f28c1a0c6768295e..30ce5c7bc5db7e5211aac7b5034080ca6af75ecb 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -40,7 +40,6 @@
 
 #include <vlc_filter.h>
 #include <vlc_block.h>
-#include <vlc_osd.h>
 
 #include <vlc_stream.h>
 #include <vlc_xml.h>