X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Ferase.c;h=19d1dbafd7aaebe45483021b0fe05d80efcc10b4;hb=e783b74eca272d40c90c1bf3982894e074f11808;hp=45feb15a8c600bbd9f756d80b76f990fe6b94556;hpb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;p=vlc diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c index 45feb15a8c..19d1dbafd7 100644 --- a/modules/video_filter/erase.c +++ b/modules/video_filter/erase.c @@ -29,13 +29,14 @@ # include "config.h" #endif -#include +#include #include #include #include #include "vlc_image.h" #include "vlc_filter.h" +#include "filter_picture.h" /***************************************************************************** * Local prototypes @@ -77,7 +78,7 @@ vlc_module_begin(); set_callbacks( Create, Destroy ); vlc_module_end(); -static const char *ppsz_filter_options[] = { +static const char *const ppsz_filter_options[] = { "mask", "x", "y", NULL }; @@ -216,16 +217,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) /* Here */ FilterErase( p_filter, p_pic, p_outpic ); - p_outpic->date = p_pic->date; - p_outpic->b_force = p_pic->b_force; - p_outpic->i_nb_fields = p_pic->i_nb_fields; - p_outpic->b_progressive = p_pic->b_progressive; - p_outpic->b_top_field_first = p_pic->b_top_field_first; - - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); - - return p_outpic; + return CopyInfoAndRelease( p_outpic, p_pic ); } /*****************************************************************************