[vlc-commits] commit: Removed now useless vlc_osd.h includes. (Laurent Aimar )
git at videolan.org
git at videolan.org
Tue May 4 22:26:15 CEST 2010
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue May 4 21:46:17 2010 +0200| [a01d5d94f9292d300411c67b30ce1075923a3080] | committer: Laurent Aimar
Removed now useless vlc_osd.h includes.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a01d5d94f9292d300411c67b30ce1075923a3080
---
modules/codec/avcodec/subtitle.c | 1 -
modules/codec/cc.c | 1 -
modules/codec/kate.c | 1 -
modules/codec/libass.c | 1 -
modules/codec/subtitles/subsdec.h | 1 -
modules/codec/svcdsub.c | 1 -
modules/codec/zvbi.c | 2 +-
modules/misc/freetype.c | 1 -
modules/stream_out/transcode/osd.c | 2 +-
modules/stream_out/transcode/spu.c | 2 +-
modules/stream_out/transcode/transcode.c | 2 +-
modules/stream_out/transcode/video.c | 2 +-
modules/video_filter/audiobargraph_v.c | 1 -
modules/video_filter/logo.c | 1 -
modules/video_filter/marq.c | 1 -
modules/video_filter/remoteosd.c | 1 -
modules/video_filter/rss.c | 1 -
17 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index 8b47448..20284b2 100644
--- 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 237d875..ee20e50 100644
--- 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 ee12f48..7f697bd 100644
--- 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 d98d34d..77e66bc 100644
--- 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 11db067..aaf307d 100644
--- 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 c8210d1..7751e82 100644
--- 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 75ae69b..720eb64 100644
--- 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 e8f9bbf..5fc41fd 100644
--- 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 4424f6e..2448541 100644
--- 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 95db5e2..c53a3c2 100644
--- 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 724a44d..3d4a846 100644
--- 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 7a1dd8a..246d4ea 100644
--- 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 3d16738..156b0ec 100644
--- 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 6db8e4d..c15f1e3 100644
--- 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 3365530..e13beb0 100644
--- 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 97dfe00..f11ec07 100644
--- 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 91c573c..30ce5c7 100644
--- 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>
More information about the vlc-commits
mailing list