[vlc-commits] commit: Moved picture_heap_t out of vlc_vout.h (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Apr 18 19:58:19 2010 +0200| [b147e3fa234f2a9ba6ad9db5efcf3eea369a160f] | committer: Laurent Aimar 

Moved picture_heap_t out of vlc_vout.h

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

 include/vlc_common.h             |    1 -
 include/vlc_vout.h               |   13 -------------
 src/video_output/vout_internal.h |   13 +++++++++++++
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 911f62c..da2b219 100644
--- 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 0854908..c7300ae 100644
--- 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 1724b9d..6a754a1 100644
--- 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
 {