[FFmpeg-devel] [PATCH] avcodec/libx264: fix compilation with x264 builds >= 153

[Derek Buitenhuis]

On 12/25/2017 8:58 PM, James Almer wrote:
> @@ -272,6 +272,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
>                        int *got_packet)
>  {
>      X264Context *x4 = ctx->priv_data;
> +    const av_unused AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(ctx->pix_fmt);

Why is this marked unused? Its usage is not behind any ifdef.

>      x264_nal_t *nal;
>      int nnal, i, ret;
>      x264_picture_t pic_out = {0};
> @@ -279,7 +280,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
>  
>      x264_picture_init( &x4->pic );
>      x4->pic.img.i_csp   = x4->params.i_csp;
> -    if (x264_bit_depth > 8)
> +    if (desc->comp[0].depth > 8)
>          x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;

Should this and the previous part be part of a different commit? They seem
more like a bugfix than an API usage change.

- Derek