Re: pkg/53111: multimedia/ffmpeg1 does not compile with x264-devel-20180224

[Martin Husemann <martin%duskware.de@localhost>]

The following reply was made to PR pkg/53111; it has been noted by GNATS.

From: Martin Husemann <martin%duskware.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/53111: multimedia/ffmpeg1 does not compile with
 x264-devel-20180224
Date: Tue, 20 Mar 2018 08:38:57 +0100

 Here is a simple patch that makes it compile for me, but I did not check
 version dependencies/history, and this looks wrong (going back to config
 time instead of runtime decision).
 
 Martin
 
 
 --- libavcodec/libx264.c.orig	2015-02-12 15:38:18.000000000 +0100
 +++ libavcodec/libx264.c	2018-03-20 08:26:56.207459765 +0100
 @@ -159,7 +159,7 @@ static int X264_frame(AVCodecContext *ct
  
      x264_picture_init( &x4->pic );
      x4->pic.img.i_csp   = x4->params.i_csp;
 -    if (x264_bit_depth > 8)
 +    if (X264_BIT_DEPTH > 8)
          x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
      x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);
  
 @@ -609,11 +609,11 @@ static const enum AVPixelFormat pix_fmts
  
  static av_cold void X264_init_static(AVCodec *codec)
  {
 -    if (x264_bit_depth == 8)
 +    if (X264_BIT_DEPTH == 8)
          codec->pix_fmts = pix_fmts_8bit;
 -    else if (x264_bit_depth == 9)
 +    else if (X264_BIT_DEPTH == 9)
          codec->pix_fmts = pix_fmts_9bit;
 -    else if (x264_bit_depth == 10)
 +    else if (X264_BIT_DEPTH == 10)
          codec->pix_fmts = pix_fmts_10bit;
  }