X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vout.h;h=e739d93611b9fa43335963ba4735d2a6a0126fb3;hb=eaf80712d1dd84693e497f49c91e6a1d16377ce2;hp=9c6f47e2fb3b834332262e65b31aee1fc8007576;hpb=635c886f4c46011e12464d846de1bbbc5ad5363d;p=vlc

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 9c6f47e2fb..e739d93611 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -80,10 +80,9 @@ struct picture_heap_t
  * \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)
-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 ) );
-
+        vout_AllocatePicture(VLC_OBJECT(a),b,c,d,e,f,g)
 
 /**
  * \defgroup video_output Video Output
@@ -108,6 +107,7 @@ typedef struct vout_thread_sys_t vout_thread_sys_t;
 struct vout_thread_t
 {
     VLC_COMMON_MEMBERS
+    bool                b_error;
 
     /** \name Thread properties and locks */
     /**@{*/
@@ -243,8 +243,8 @@ struct vout_thread_t
  * \return a vout if p_fmt is non NULL and the request is successfull, NULL
  * otherwise
  */
-#define vout_Request(a,b,c) __vout_Request(VLC_OBJECT(a),b,c)
-VLC_EXPORT( vout_thread_t *, __vout_Request,    ( vlc_object_t *p_this, vout_thread_t *p_vout, video_format_t *p_fmt ) );
+VLC_EXPORT( vout_thread_t *, vout_Request, ( vlc_object_t *p_this, vout_thread_t *p_vout, video_format_t *p_fmt ) );
+#define vout_Request(a,b,c) vout_Request(VLC_OBJECT(a),b,c)
 
 /**
  * This function will create a suitable vout for a given p_fmt. It will never
@@ -255,8 +255,8 @@ VLC_EXPORT( vout_thread_t *, __vout_Request,    ( vlc_object_t *p_this, vout_thr
  * \param p_fmt the video format requested
  * \return a vout if the request is successfull, NULL otherwise
  */
-#define vout_Create(a,b) __vout_Create(VLC_OBJECT(a),b)
-VLC_EXPORT( vout_thread_t *, __vout_Create,       ( vlc_object_t *p_this, video_format_t *p_fmt ) );
+VLC_EXPORT( vout_thread_t *, vout_Create, ( vlc_object_t *p_this, video_format_t *p_fmt ) );
+#define vout_Create(a,b) vout_Create(VLC_OBJECT(a),b)
 
 /**
  * This function will close a vout created by vout_Create or vout_Request.