X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Ferase.c;h=33f507bf2ef86099b7b04d6bfd7d046dc9bd2d3f;hb=2795385d8edbee335d6abbb8fa05088c2dc7e846;hp=19d1dbafd7aaebe45483021b0fe05d80efcc10b4;hpb=2085fb08ae43ba48a2ab115505b9524808233b3c;p=vlc diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c index 19d1dbafd7..33f507bf2e 100644 --- a/modules/video_filter/erase.c +++ b/modules/video_filter/erase.c @@ -107,7 +107,7 @@ static void LoadMask( filter_t *p_filter, const char *psz_filename ) if( p_filter->p_sys->p_mask ) { if( p_old_mask ) - p_old_mask->pf_release( p_old_mask ); + picture_Release( p_old_mask ); } else if( p_old_mask ) { @@ -146,10 +146,7 @@ static int Create( vlc_object_t *p_this ) /* Allocate structure */ p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_filter->p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } p_sys = p_filter->p_sys; p_filter->pf_video_filter = Filter; @@ -189,7 +186,7 @@ static void Destroy( vlc_object_t *p_this ) filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys = p_filter->p_sys; if( p_sys->p_mask ) - p_sys->p_mask->pf_release( p_sys->p_mask ); + picture_Release( p_sys->p_mask ); vlc_mutex_destroy( &p_sys->lock ); @@ -205,12 +202,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) if( !p_pic ) return NULL; - p_outpic = p_filter->pf_vout_buffer_new( p_filter ); + p_outpic = filter_NewPicture( p_filter ); if( !p_outpic ) { - msg_Warn( p_filter, "can't get output picture" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; }