[vlc-commits] commit: Removed useless vlc_osd.h includes. (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu May  6 21:38:35 2010 +0200| [b57a4d9d1fee564713abea99d74ddbb63c9de13a] | committer: Laurent Aimar 

Removed useless vlc_osd.h includes.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b57a4d9d1fee564713abea99d74ddbb63c9de13a
---

 src/control/video.c                 |    1 -
 src/input/decoder.c                 |    2 +-
 src/input/resource.c                |    2 +-
 src/input/stream.c                  |    1 -
 src/video_output/video_output.c     |    2 +-
 src/video_output/video_widgets.c    |    2 +-
 src/video_output/vout_intf.c        |    2 +-
 src/video_output/vout_pictures.c    |    1 -
 src/video_output/vout_subpictures.c |    2 +-
 9 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/control/video.c b/src/control/video.c
index 8614c62..ebdafa1 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -38,7 +38,6 @@
 #include <vlc_vout.h>
 
 #include "media_player_internal.h"
-#include <vlc_osd.h>
 #include <assert.h>
 
 /*
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 547dcfc..9c0aa3d 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -38,7 +38,7 @@
 #include <vlc_aout.h>
 #include <vlc_sout.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 #include <vlc_meta.h>
 #include <vlc_dialog.h>
 
diff --git a/src/input/resource.c b/src/input/resource.c
index bfe3e89..ba3cf7e 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -32,7 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_vout.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 #include <vlc_aout.h>
 #include <vlc_sout.h>
 #include "../libvlc.h"
diff --git a/src/input/stream.c b/src/input/stream.c
index aaf7f94..eedd3a4 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -30,7 +30,6 @@
 
 #include <vlc_common.h>
 #include <vlc_strings.h>
-#include <vlc_osd.h>
 #include <vlc_memory.h>
 
 #include <libvlc.h>
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 19daccb..5069d7c 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -43,7 +43,7 @@
 #include <vlc_vout.h>
 
 #include <vlc_filter.h>
-#include <vlc_osd.h>
+#include <vlc_vout_osd.h>
 
 #include <libvlc.h>
 #include <vlc_input.h>
diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index c6aa96b..335edef 100644
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -31,7 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_vout.h>
-#include <vlc_osd.h>
+#include <vlc_vout_osd.h>
 
 #include <vlc_filter.h>
 
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 70a2768..a06762a 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -43,7 +43,7 @@
 
 #include <vlc_vout.h>
 #include <vlc_image.h>
-#include <vlc_osd.h>
+#include <vlc_vout_osd.h>
 #include <vlc_strings.h>
 #include <vlc_charset.h>
 #include "../libvlc.h"
diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 8d0b9d3..a48a74b 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -34,7 +34,6 @@
 #include <vlc_common.h>
 #include <libvlc.h>
 #include <vlc_vout.h>
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 #include <vlc_image.h>
 #include <vlc_block.h>
diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 7a94ad5..87067d9 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -37,7 +37,7 @@
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 #include "../libvlc.h"
 #include "vout_internal.h"
 #include <vlc_image.h>