X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vout.h;h=d3382771abdb0de8d41200fec1a56d4b2b50f9c3;hb=588723d7c65ccdb0fa5cc39b3cae132176637300;hp=420ad51faa38d95665b3abd80dce0de2ea5c8fd4;hpb=6d937c8f88c36262433d5060a82f9cd3d5c69786;p=vlc diff --git a/include/vlc_vout.h b/include/vlc_vout.h index 420ad51faa..d3382771ab 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -167,6 +167,8 @@ static inline void picture_CopyProperties( picture_t *p_dst, const picture_t *p_ /** * This function will copy the picture pixels. + * You can safely copy between pictures that do not have the same size, + * only the compatible(smaller) part will be copied. */ VLC_EXPORT( void, picture_CopyPixels, ( picture_t *p_dst, const picture_t *p_src ) ); @@ -349,9 +351,9 @@ struct subpicture_t video_format_t *, picture_t * ); void ( *pf_destroy_region ) ( vlc_object_t *, subpicture_region_t * ); - void ( *pf_pre_render ) ( video_format_t *, spu_t *, subpicture_t *, mtime_t ); - subpicture_region_t * ( *pf_update_regions ) ( video_format_t *, spu_t *, - subpicture_t *, mtime_t ); + void ( *pf_pre_render ) ( video_format_t *, spu_t *, subpicture_t * ); + void ( *pf_update_regions ) ( video_format_t *, spu_t *, + subpicture_t *, mtime_t ); /** Private data - the subtitle plugin might want to put stuff here to * keep track of the subpicture */