[vlc-devel] commit: Privatized SUBPICTURE_RENDERED. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Sep 21 13:26:21 2008 +0200| [9c5ebdcdce400c4a2a93a1b9ac8845e882949003] | committer: Laurent Aimar 

Privatized SUBPICTURE_RENDERED.

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

 include/vlc_vout.h                  |    3 ---
 src/video_output/vout_subpictures.c |    7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 8920930..277afa4 100644
--- 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 e1ec4dc..fa7fdd7 100644
--- 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 * );