[vlc-devel] [PATCH] adjust: don't create variables if invalid chroma

[Thomas Guillem]

Applied, thanks !

On Thu, Jun 22, 2017, at 09:24, Victorien Le Couviour--Tuffet wrote:
> ---
>  modules/video_filter/adjust.c | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/modules/video_filter/adjust.c
> b/modules/video_filter/adjust.c
> index 82318aa6e6..fb5d776c75 100644
> --- a/modules/video_filter/adjust.c
> +++ b/modules/video_filter/adjust.c
> @@ -145,19 +145,6 @@ static int Create( vlc_object_t *p_this )
>          return VLC_ENOMEM;
>      p_sys = p_filter->p_sys;
>  
> -    /* needed to get options passed in transcode using the
> -     * adjust{name=value} syntax */
> -    config_ChainParse( p_filter, "", ppsz_filter_options,
> -                   p_filter->p_cfg );
> -
> -    p_sys->f_contrast = var_CreateGetFloatCommand( p_filter, "contrast"
> );
> -    p_sys->f_brightness = var_CreateGetFloatCommand( p_filter,
> "brightness" );
> -    p_sys->f_hue = var_CreateGetFloatCommand( p_filter, "hue" );
> -    p_sys->f_saturation = var_CreateGetFloatCommand( p_filter,
> "saturation" );
> -    p_sys->f_gamma = var_CreateGetFloatCommand( p_filter, "gamma" );
> -    p_sys->b_brightness_threshold =
> -        var_CreateGetBoolCommand( p_filter, "brightness-threshold" );
> -
>      /* Choose Planar/Packed function and pointer to a Hue/Saturation
>      processing
>       * function*/
>      switch( p_filter->fmt_in.video.i_chroma )
> @@ -191,6 +178,19 @@ static int Create( vlc_object_t *p_this )
>              return VLC_EGENERIC;
>      }
>  
> +    /* needed to get options passed in transcode using the
> +     * adjust{name=value} syntax */
> +    config_ChainParse( p_filter, "", ppsz_filter_options,
> +                   p_filter->p_cfg );
> +
> +    p_sys->f_contrast = var_CreateGetFloatCommand( p_filter, "contrast"
> );
> +    p_sys->f_brightness = var_CreateGetFloatCommand( p_filter,
> "brightness" );
> +    p_sys->f_hue = var_CreateGetFloatCommand( p_filter, "hue" );
> +    p_sys->f_saturation = var_CreateGetFloatCommand( p_filter,
> "saturation" );
> +    p_sys->f_gamma = var_CreateGetFloatCommand( p_filter, "gamma" );
> +    p_sys->b_brightness_threshold =
> +        var_CreateGetBoolCommand( p_filter, "brightness-threshold" );
> +
>      vlc_mutex_init( &p_sys->lock );
>      var_AddCallback( p_filter, "contrast",   AdjustCallback, p_sys );
>      var_AddCallback( p_filter, "brightness", AdjustCallback, p_sys );
> -- 
> 2.13.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel