Moved picture_heap_t out of vlc_vout.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 911f62c7a093c370e0bde35baf6f01ac6868511f..da2b219c837a76df34f73cc3e429c2d198b7f3be 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -251,7 +251,6 @@ typedef struct vout_thread_t vout_thread_t;
 typedef video_format_t video_frame_format_t;
 typedef struct picture_t picture_t;
 typedef struct picture_sys_t picture_sys_t;
-typedef struct picture_heap_t picture_heap_t;
 
 /* Subpictures */
 typedef struct spu_t spu_t;

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 08549089d5d39889120d470dd2c75e7c05ea46e5..c7300ae1ebac9b04870e9741d54d438aa912a06f 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -35,19 +35,6 @@
 #include <vlc_filter.h>
 #include <vlc_subpicture.h>
 
-/**
- * Video picture heap, either render (to store pictures used
- * by the decoder) or output (to store pictures displayed by the vout plugin)
- */
-struct picture_heap_t
-{
-    int i_pictures;                                   /**< current heap size */
-
-    /* Real pictures */
-    picture_t*      pp_picture[VOUT_MAX_PICTURES];             /**< pictures */
-    int             i_last_used_pic;              /**< last used pic in heap */
-};
-
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/

diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 1724b9d0b8bb73f42acc62b2dd0c9149fa232293..6a754a1aeeb7033cd767291e43f5243ff2344901 100644 (file)
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -40,6 +40,19 @@
 /* */
 typedef struct vout_sys_t vout_sys_t;
 
+/**
+ * Video picture heap, either render (to store pictures used
+ * by the decoder) or output (to store pictures displayed by the vout plugin)
+ */
+typedef struct
+{
+    int i_pictures;                                   /**< current heap size */
+
+    /* Real pictures */
+    picture_t*      pp_picture[VOUT_MAX_PICTURES];             /**< pictures */
+    int             i_last_used_pic;              /**< last used pic in heap */
+} picture_heap_t;
+
 /* */
 struct vout_thread_sys_t
 {