Privatized SUBPICTURE_RENDERED.

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 8920930bfff78ccda7cd639a754ccc3352acd46a..277afa4200f5fbc12468d0963ec41c70117a77b9 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -415,9 +415,6 @@ struct subpicture_t
 #define SUBPICTURE_ALIGN_MASK ( SUBPICTURE_ALIGN_LEFT|SUBPICTURE_ALIGN_RIGHT| \
                                 SUBPICTURE_ALIGN_TOP |SUBPICTURE_ALIGN_BOTTOM )
 
-/* Subpicture rendered flag - should only be used by vout_subpictures */
-#define SUBPICTURE_RENDERED  0x10
-
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index e1ec4dcd3572aa1dde208bf5f177c08ec44b234a..fa7fdd71748fe5cf4371d7e1ddb7fda7e77d27a0 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -91,6 +91,13 @@ struct subpicture_region_private_t
     picture_t      *p_picture;
 };
 
+/* Subpicture rendered flag
+ * FIXME ? it could be moved to private ? */
+#define SUBPICTURE_RENDERED  (0x1000)
+#ifdef SUBPICTURE_RENDERED < SUBPICTURE_ALIGN_MASK
+#   error SUBPICTURE_RENDERED too low
+#endif
+
 static void SpuRegionPrivateDestroy( subpicture_region_private_t *p_private );
 
 static void UpdateSPU   ( spu_t *, vlc_object_t * );