[vlc-commits] Do not include <vlc_spu.h> in <vlc_vout_osd.h>

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun 24 00:35:22 2015 +0300| [b83c41ccdd644e7a17680f2891dbda9d93241346] | committer: Rémi Denis-Courmont

Do not include <vlc_spu.h> in <vlc_vout_osd.h>

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

 include/vlc_spu.h               |    3 ---
 include/vlc_vout_osd.h          |    5 +++--
 src/video_output/video_output.c |    1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/vlc_spu.h b/include/vlc_spu.h
index cfaabd7..cf6897a 100644
--- a/include/vlc_spu.h
+++ b/include/vlc_spu.h
@@ -41,9 +41,6 @@ extern "C" {
 
 typedef struct spu_private_t spu_private_t;
 
-/* Default subpicture channel ID */
-#define SPU_DEFAULT_CHANNEL (1)
-
 /**
  * Subpicture unit descriptor
  */
diff --git a/include/vlc_vout_osd.h b/include/vlc_vout_osd.h
index 22fe7bf..5713893 100644
--- a/include/vlc_vout_osd.h
+++ b/include/vlc_vout_osd.h
@@ -26,8 +26,6 @@
 #ifndef VLC_VOUT_OSD_H
 #define VLC_VOUT_OSD_H 1
 
-#include <vlc_spu.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -40,6 +38,9 @@ extern "C" {
  * Overlay text and widgets
  */
 
+//* Default subpicture channel ID */
+#define SPU_DEFAULT_CHANNEL (1)
+
 /**
  * OSD menu position and picture type defines
  */
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 0ff1274..a87e0b7 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -43,6 +43,7 @@
 #include <vlc_vout.h>
 
 #include <vlc_filter.h>
+#include <vlc_spu.h>
 #include <vlc_vout_osd.h>
 #include <vlc_image.h>