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

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Apr 18 03:35:10 2010 +0200| [e0e818e1db95df0cc3c27c2bb23c875cf1be1144] | committer: Laurent Aimar 

Moved vout_AllocatePicture out of vlc_vout.h

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

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

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index e501d1e..190884a 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -69,19 +69,6 @@ struct picture_heap_t
  *****************************************************************************/
 
 /**
- * Initialise different fields of a picture_t and allocates the picture buffer.
- * \param p_this a vlc object
- * \param p_pic pointer to the picture structure.
- * \param i_chroma the wanted chroma for the picture.
- * \param i_width the wanted width for the picture.
- * \param i_height the wanted height for the picture.
- * \param i_aspect the wanted aspect ratio for the picture.
- */
-VLC_EXPORT( int, vout_AllocatePicture,( vlc_object_t *p_this, picture_t *p_pic, uint32_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den ) );
-#define vout_AllocatePicture(a,b,c,d,e,f,g) \
-        vout_AllocatePicture(VLC_OBJECT(a),b,c,d,e,f,g)
-
-/**
  * \defgroup video_output Video Output
  * This module describes the programming interface for video output threads.
  * It includes functions allowing to open a new thread, send pictures to a
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 3d64993..f07ec4b 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -605,7 +605,6 @@ vlm_MessageDelete
 vlm_MessageNew
 vlm_MessageSimpleNew
 vlm_New
-vout_AllocatePicture
 vout_Close
 vout_Create
 vout_CreatePicture
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 466f2cc..5e12351 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -102,6 +102,11 @@ struct vout_thread_sys_t
     vlc_mouse_t     mouse;
 };
 
+/* */
+int vout_AllocatePicture( vlc_object_t *, picture_t *, uint32_t i_chroma, int i_width, int i_height, int i_sar_num, int i_sar_den );
+#define vout_AllocatePicture(a,b,c,d,e,f,g) \
+        vout_AllocatePicture(VLC_OBJECT(a),b,c,d,e,f,g)
+
 /* DO NOT use vout_RenderPicture/vout_IntfInit unless you are in src/video_ouput */
 picture_t *vout_RenderPicture( vout_thread_t *, picture_t *,
                                subpicture_t *,