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

LegendGC · Jun 23, 2015 · b83c41c · b83c41c
1 parent be54712
commit b83c41c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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>