X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fscale.c;h=0f72c5bd24bb0504e9e772be6f563aa618f63203;hb=34d2ff171b428be5e2532799e75cce2559802708;hp=e2c3da8b3a57dc8dd589b75e579f8b2b1a9947dc;hpb=4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b;p=vlc diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c index e2c3da8b3a..0f72c5bd24 100644 --- a/modules/video_filter/scale.c +++ b/modules/video_filter/scale.c @@ -32,23 +32,12 @@ #include #include -#include "vlc_filter.h" - -/***************************************************************************** - * filter_sys_t : filter descriptor - *****************************************************************************/ -struct filter_sys_t -{ - es_format_t fmt_in; - es_format_t fmt_out; -}; +#include /**************************************************************************** * Local prototypes ****************************************************************************/ static int OpenFilter ( vlc_object_t * ); -static void CloseFilter( vlc_object_t * ); - static picture_t *Filter( filter_t *, picture_t * ); /***************************************************************************** @@ -57,7 +46,7 @@ static picture_t *Filter( filter_t *, picture_t * ); vlc_module_begin () set_description( N_("Video scaling filter") ) set_capability( "video filter2", 10 ) - set_callbacks( OpenFilter, CloseFilter ) + set_callbacks( OpenFilter, NULL ) vlc_module_end () /***************************************************************************** @@ -66,7 +55,6 @@ vlc_module_end () static int OpenFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t*)p_this; - filter_sys_t *p_sys; if( ( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVP && p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA && @@ -79,11 +67,6 @@ static int OpenFilter( vlc_object_t *p_this ) return VLC_EGENERIC; } - /* Allocate the memory needed to store the decoder's structure */ - if( ( p_filter->p_sys = p_sys = - (filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL ) - return VLC_ENOMEM; - p_filter->pf_video_filter = Filter; msg_Dbg( p_filter, "%ix%i -> %ix%i", p_filter->fmt_in.video.i_width, @@ -93,17 +76,6 @@ static int OpenFilter( vlc_object_t *p_this ) return VLC_SUCCESS; } -/***************************************************************************** - * CloseFilter: clean up the filter - *****************************************************************************/ -static void CloseFilter( vlc_object_t *p_this ) -{ - filter_t *p_filter = (filter_t*)p_this; - filter_sys_t *p_sys = p_filter->p_sys; - - free( p_sys ); -} - /**************************************************************************** * Filter: the whole thing ****************************************************************************/