[vlc-devel] [PATCH] x264: Fix build with a newer version of x264

[Thomas Guillem]

On Sun, Mar 18, 2018, at 03:06, Kamil Rytarowski wrote:
> Make this module compatible with x264-devel-20180224.
> 
> x264_bit_depth is unavailable on versions (X264_BUILD) newer than 153.
> 
> Reported error:
> codec/x264.c:849:26: error: use of undeclared identifier 'x264_bit_depth'
>         const int mask = x264_bit_depth > 8 ? X264_CSP_HIGH_DEPTH : 0;

I think it should be replaced with the new way to get the bit_depth.

>                          ^
> 1 error generated.
> 
> Detected on NetBSD/amd64 with pkgsrc-current.
> ---
>  modules/codec/x264.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/modules/codec/x264.c b/modules/codec/x264.c
> index e02048f075..dec95a9c78 100644
> --- a/modules/codec/x264.c
> +++ b/modules/codec/x264.c
> @@ -842,7 +842,7 @@ static int  Open ( vlc_object_t *p_this )
>      fullrange |= p_enc->fmt_in.video.b_color_range_full;
>      p_enc->fmt_in.i_codec = fullrange ? VLC_CODEC_J420 : VLC_CODEC_I420;
>      p_sys->i_colorspace = X264_CSP_I420;
> -#if X264_BUILD >= 118
> +#if X264_BUILD >= 118 && X264_BUILD < 153
>      char *psz_profile = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
>      if( psz_profile )
>      {
> -- 
> 2.16.2
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel