Moved vout_AllocatePicture out of vlc_vout.h

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index e501d1e76af963e590c82958eb254e3ea912b248..190884a3ec6d9725c06bac9b8a16bb7ff2f620de 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -68,19 +68,6 @@ struct picture_heap_t
  * Prototypes
  *****************************************************************************/
 
-/**
- * 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.

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 3d649932b031e12a68129d57703239319219f7ec..f07ec4b931f41af11046c43458f0bb21c6f8b63c 100644 (file)
--- 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 466f2ccd6ff2650b4295e339d8b49692cb92d36f..5e123515a0c5256a2aa74069b14781b2ad63ce1a 100644 (file)
--- 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 *,