Skip to content

V
vlc
Commit 13caaaf3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

swscale: remove constant parameter

parent 70ac90e0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
modules/video_chroma/swscale.c
View file @ 13caaaf3
...@@ -85,8 +85,7 @@ vlc_module_end () ...@@ -85,8 +85,7 @@ vlc_module_end ()
*/ */
struct filter_sys_t struct filter_sys_t
{ {
SwsFilter *p_src_filter; SwsFilter *p_filter;
SwsFilter *p_dst_filter;
int i_cpu_mask, i_sws_flags; int i_cpu_mask, i_sws_flags;
video_format_t fmt_in; video_format_t fmt_in;
...@@ -183,8 +182,8 @@ static int OpenScaler( vlc_object_t *p_this ) ...@@ -183,8 +182,8 @@ static int OpenScaler( vlc_object_t *p_this )
if( Init( p_filter ) ) if( Init( p_filter ) )
{ {
if( p_sys->p_src_filter ) if( p_sys->p_filter )
sws_freeFilter( p_sys->p_src_filter ); sws_freeFilter( p_sys->p_filter );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -213,8 +212,8 @@ static void CloseScaler( vlc_object_t *p_this ) ...@@ -213,8 +212,8 @@ static void CloseScaler( vlc_object_t *p_this )
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
Clean( p_filter ); Clean( p_filter );
if( p_sys->p_src_filter ) if( p_sys->p_filter )
sws_freeFilter( p_sys->p_src_filter ); sws_freeFilter( p_sys->p_filter );
free( p_sys ); free( p_sys );
} }
...@@ -416,7 +415,7 @@ static int Init( filter_t *p_filter ) ...@@ -416,7 +415,7 @@ static int Init( filter_t *p_filter )
ctx = sws_getContext( iwidth, iheight, i_fmti, ctx = sws_getContext( iwidth, iheight, i_fmti,
owidth, oheight, i_fmto, owidth, oheight, i_fmto,
cfg.i_sws_flags | p_sys->i_cpu_mask, cfg.i_sws_flags | p_sys->i_cpu_mask,
p_sys->p_src_filter, p_sys->p_dst_filter, 0 ); p_sys->p_filter, NULL, 0 );
if( n == 0 ) if( n == 0 )
p_sys->ctx = ctx; p_sys->ctx = ctx;
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment