Moved picture_heap_t out of vlc_vout.h

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;

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
  *****************************************************************************/

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
 {