Fix padding for picture_t and subpicture_t.

[vlc] / include / vlc_vout.h

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index 0d64ccbefb5d3563959fbcb135349f0ac3c8ff8a..d8ca180d7fda36ff1df2a54d73d9f13901b39051 100644 (file)
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -67,9 +67,6 @@ struct picture_heap_t
     void (* pf_setpalette) ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
 };
 
-/* Default subpicture channel ID */
-#define DEFAULT_CHAN           1
-
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
@@ -83,9 +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.
  */
-#define vout_AllocatePicture(a,b,c,d,e,f) \
-        __vout_AllocatePicture(VLC_OBJECT(a),b,c,d,e,f)
-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_aspect ) );
+#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 ) );
 
 
 /**
@@ -320,7 +317,7 @@ VLC_EXPORT( void,            vout_PlacePicture,   ( const vout_thread_t *, unsig
 VLC_EXPORT( spu_t *, vout_GetSpu, ( vout_thread_t * ) );
 
 void vout_IntfInit( vout_thread_t * );
-VLC_EXPORT( void, vout_EnableFilter, ( vout_thread_t *, char *,bool , bool  ) );
+VLC_EXPORT( void, vout_EnableFilter, ( vout_thread_t *, const char *,bool , bool  ) );
 
 
 static inline int vout_vaControl( vout_thread_t *p_vout, int i_query,