 @@ -1,226 +1,515 @@
-$NetBSD: patch-encode_encode_lavc.c,v 1.2 2015/11/21 17:14:26 adam Exp $
+$NetBSD: patch-encode_encode_lavc.c,v 1.3 2019/12/29 10:23:53 markd Exp $
-Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).
+Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 --- encode/encode_lavc.c.orig	2011-11-19 16:50:27.000000000 +0000
 +++ encode/encode_lavc.c
-@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
+@@ -74,6 +74,16 @@ struct tclavcconfigdata_ {
      int lmin;
      int lmax;
      int me_method;
 +    int luma_elim_threshold;
 +    int chroma_elim_threshold;
 +    int quantizer_noise_shaping;
 +    int inter_quant_bias;
 +    int intra_quant_bias;
 +    int scenechange_factor;
 +    int rc_strategy;
 +    float rc_initial_cplx;
 +    float rc_qsquish;
 +    float border_masking;
      /* same as above for flags */
      struct {
-@@ -114,6 +117,7 @@ struct tclavcprivatedata_ {
+@@ -114,6 +124,7 @@ struct tclavcprivatedata_ {
      AVFrame ff_venc_frame;
      AVCodecContext ff_vcontext;
 +    AVDictionary * ff_opts;
      AVCodec *ff_vcodec;
-@@ -164,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
+@@ -164,6 +175,7 @@ static const TCCodecID tc_lavc_codecs_ou
      TC_CODEC_ERROR
  };
 +#if LIBAVCODEC_VERSION_MAJOR < 55
  static const enum CodecID tc_lavc_internal_codecs[] = {
      CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
      CODEC_ID_H263I, CODEC_ID_H263P,
-@@ -176,6 +181,20 @@ static const enum CodecID tc_lavc_intern
+@@ -176,6 +188,20 @@ static const enum CodecID tc_lavc_intern
      CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
      CODEC_ID_NONE
  };
 +#else
 +static const enum AVCodecID tc_lavc_internal_codecs[] = {
 +    AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
 +    AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
 +    AV_CODEC_ID_H264,
 +    AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
 +    AV_CODEC_ID_RV10,
 +    AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
 +    AV_CODEC_ID_DVVIDEO,
 +    AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
 +    AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
 +    AV_CODEC_ID_NONE
 +};
 +#endif
  static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
-@@ -937,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
+@@ -214,7 +240,7 @@ static void pre_encode_video_yuv420p(TCL
                                       vframe_list_t *vframe)
+ {
      avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
 -                    PIX_FMT_YUV420P,
 +                    AV_PIX_FMT_YUV420P,
                      pd->ff_vcontext.width, pd->ff_vcontext.height);
+ }
@@ -228,7 +254,7 @@ static void pre_encode_video_yuv420p_huf
                      IMG_YUV_DEFAULT,
                      pd->ff_vcontext.width, pd->ff_vcontext.height);
      avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
 -                   PIX_FMT_YUV422P,
 +                   AV_PIX_FMT_YUV422P,
                     pd->ff_vcontext.width, pd->ff_vcontext.height);
      ac_imgconvert(src, IMG_YUV_DEFAULT,
                    pd->ff_venc_frame.data, IMG_YUV422P,
@@ -244,7 +270,7 @@ static void pre_encode_video_yuv422p(TCL
                      IMG_YUV422P,
                      pd->ff_vcontext.width, pd->ff_vcontext.height);
      avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
 -                   PIX_FMT_YUV420P,
 +                   AV_PIX_FMT_YUV420P,
                     pd->ff_vcontext.width, pd->ff_vcontext.height);
      ac_imgconvert(src, IMG_YUV422P,
                    pd->ff_venc_frame.data, IMG_YUV420P,
@@ -256,7 +282,7 @@ static void pre_encode_video_yuv422p_huf
                                               vframe_list_t *vframe)
+ {
      avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
 -                   PIX_FMT_YUV422P,
 +                   AV_PIX_FMT_YUV422P,
                     pd->ff_vcontext.width, pd->ff_vcontext.height);
+ }
@@ -266,7 +292,7 @@ static void pre_encode_video_rgb24(TCLav
                                     vframe_list_t *vframe)
+ {
      avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
 -                   PIX_FMT_YUV420P,
 +                   AV_PIX_FMT_YUV420P,
                     pd->ff_vcontext.width, pd->ff_vcontext.height);
      ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT,
                    pd->ff_venc_frame.data, IMG_YUV420P,
@@ -591,21 +617,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
        case CODEC_YUV:
          if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
              pd->tc_pix_fmt = TC_CODEC_YUV422P;
 -            pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
 +            pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
              pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
          } else {
              pd->tc_pix_fmt = TC_CODEC_YUV420P;
              pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
 -                                       ? PIX_FMT_YUVJ420P
 -                                       : PIX_FMT_YUV420P;
 +                                       ? AV_PIX_FMT_YUVJ420P
 +                                       : AV_PIX_FMT_YUV420P;
              pd->pre_encode_video = pre_encode_video_yuv420p;
+         }
          break;
        case CODEC_YUV422:
          pd->tc_pix_fmt = TC_CODEC_YUV422P;
          pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
 -                                   ? PIX_FMT_YUVJ422P
 -                                   : PIX_FMT_YUV422P;
 +                                   ? AV_PIX_FMT_YUVJ422P
 +                                   : AV_PIX_FMT_YUV422P;
          if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
              pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
          } else {
@@ -615,10 +641,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
        case CODEC_RGB:
          pd->tc_pix_fmt = TC_CODEC_RGB;
          pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
 -                                        ? PIX_FMT_YUV422P
 +                                        ? AV_PIX_FMT_YUV422P
                                          : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG)
 -                                           ? PIX_FMT_YUVJ420P
 -                                           : PIX_FMT_YUV420P;
 +                                           ? AV_PIX_FMT_YUVJ420P
 +                                           : AV_PIX_FMT_YUV420P;
          pd->pre_encode_video = pre_encode_video_rgb24;
          break;
        default:
@@ -665,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
      switch (vob->divxmultipass) {
        case 1:
          CAN_DO_MULTIPASS(multipass_flag);
 -        pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
 +        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
          pd->stats_file = fopen(vob->divxlogfile, "w");
          if (pd->stats_file == NULL) {
              tc_log_error(MOD_NAME, "could not create 2pass log file"
@@ -675,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
          break;
        case 2:
          CAN_DO_MULTIPASS(multipass_flag);
 -        pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
 +        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
          pd->stats_file = fopen(vob->divxlogfile, "r");
          if (pd->stats_file == NULL){
              tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
@@ -704,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
          break;
        case 3:
          /* fixed qscale :p */
 -        pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
 +        pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
          pd->ff_venc_frame.quality = vob->divxbitrate;
          break;
+     }
@@ -937,7 +963,11 @@ static int tc_lavc_settings_from_vob(TCL
  static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
+ {
      /* first of all reinitialize lavc data */
 +#if LIBAVCODEC_VERSION_MAJOR < 55
      avcodec_get_context_defaults(&pd->ff_vcontext);
 +#else
 +    avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
 +#endif
      pd->confdata.thread_count = 1;
-@@ -955,8 +978,6 @@ static void tc_lavc_config_defaults(TCLa
+@@ -947,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
      pd->confdata.rc_buffer_size  = 0;
      pd->confdata.lmin            = 2;
      pd->confdata.lmax            = 31;
 -    pd->confdata.me_method       = ME_EPZS;
 +    pd->confdata.me_method       = 0;
      memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
      pd->confdata.turbo_setup = 0;
@@ -955,19 +985,17 @@ static void tc_lavc_config_defaults(TCLa
      /*
       * context *transcode* (not libavcodec) defaults
       */
 -    pd->ff_vcontext.mb_qmin                 = 2;
 -    pd->ff_vcontext.mb_qmax                 = 31;
      pd->ff_vcontext.max_qdiff               = 3;
      pd->ff_vcontext.max_b_frames            = 0;
      pd->ff_vcontext.me_range                = 0;
-@@ -977,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.mb_decision             = 0;
      pd->ff_vcontext.scenechange_threshold   = 0;
 -    pd->ff_vcontext.scenechange_factor      = 1;
 +    pd->confdata.scenechange_factor         = 1;
      pd->ff_vcontext.b_frame_strategy        = 0;
      pd->ff_vcontext.b_sensitivity           = 40;
      pd->ff_vcontext.brd_scale               = 0;
      pd->ff_vcontext.bidir_refine            = 0;
 -    pd->ff_vcontext.rc_strategy             = 2;
 +    pd->confdata.rc_strategy                = 2;
      pd->ff_vcontext.b_quant_factor          = 1.25;
      pd->ff_vcontext.i_quant_factor          = 0.8;
      pd->ff_vcontext.b_quant_offset          = 1.25;
@@ -975,10 +1003,10 @@ static void tc_lavc_config_defaults(TCLa
      pd->ff_vcontext.qblur                   = 0.5;
      pd->ff_vcontext.qcompress               = 0.5;
      pd->ff_vcontext.mpeg_quant              = 0;
-     pd->ff_vcontext.rc_initial_cplx         = 0.0;
+-    pd->ff_vcontext.rc_initial_cplx         = 0.0;
-     pd->ff_vcontext.rc_qsquish              = 1.0;
+-    pd->ff_vcontext.rc_qsquish              = 1.0;
 -    pd->ff_vcontext.luma_elim_threshold     = 0;
 -    pd->ff_vcontext.chroma_elim_threshold   = 0;
 +    pd->confdata.rc_initial_cplx            = 0.0;
 +    pd->confdata.rc_qsquish              = 1.0;
 +    pd->confdata.luma_elim_threshold     = 0;
 +    pd->confdata.chroma_elim_threshold   = 0;
      pd->ff_vcontext.strict_std_compliance   = 0;
      pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
      pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
-@@ -1002,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
+@@ -987,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.temporal_cplx_masking   = 0.0;
-     pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.spatial_cplx_masking    = 0.0;
      pd->ff_vcontext.p_masking               = 0.0;
 -    pd->ff_vcontext.border_masking          = 0.0;
 +    pd->confdata.border_masking          = 0.0;
      pd->ff_vcontext.me_pre_cmp              = 0;
      pd->ff_vcontext.me_cmp                  = 0;
      pd->ff_vcontext.me_sub_cmp              = 0;
@@ -999,10 +1027,8 @@ static void tc_lavc_config_defaults(TCLa
      pd->ff_vcontext.pre_me                  = 1;
      pd->ff_vcontext.me_subpel_quality       = 8;
      pd->ff_vcontext.refs                    = 1;
 -    pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
 -    pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
      pd->ff_vcontext.noise_reduction         = 0;
 -    pd->ff_vcontext.quantizer_noise_shaping = 0;
 +    pd->confdata.quantizer_noise_shaping = 0;
      pd->ff_vcontext.flags                   = 0;
+ }
-@@ -1034,16 +1055,11 @@ static void tc_lavc_dispatch_settings(TC
+@@ -1023,27 +1049,22 @@ static void tc_lavc_config_defaults(TCLa
   */
  static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
+ {
 +    char buf[1024];
      /* some translation... */
      pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
      pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
      pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
      pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
 -    pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
 -    pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
 -    pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
 +    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
 +    av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
 +    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
 +    av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
      pd->ff_vcontext.flags = 0;
-     SET_FLAG(pd, mv0);
+-    SET_FLAG(pd, mv0);
 -    SET_FLAG(pd, cbp);
      SET_FLAG(pd, qpel);
 -    SET_FLAG(pd, alt);
 -    SET_FLAG(pd, vdpart);
-     SET_FLAG(pd, naq);
+-    SET_FLAG(pd, naq);
      SET_FLAG(pd, ilme);
      SET_FLAG(pd, ildct);
      SET_FLAG(pd, aic);
 -    SET_FLAG(pd, aiv);
 -    SET_FLAG(pd, umv);
      SET_FLAG(pd, psnr);
      SET_FLAG(pd, trell);
      SET_FLAG(pd, gray);
-@@ -1064,6 +1080,30 @@ static void tc_lavc_dispatch_settings(TC
+@@ -1061,9 +1082,49 @@ static void tc_lavc_dispatch_settings(TC
          pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
+     if (pd->interlacing.active) {
          /* enforce interlacing */
 -        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
 -        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
 +        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
 +        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
+     }
 +    if (pd->confdata.flags.alt) {
 +        av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
 +    }
 +    if (pd->confdata.flags.vdpart) {
 +        av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
 +    }
 +    if (pd->confdata.flags.umv) {
 +        av_dict_set(&(pd->ff_opts), "umv", "1", 0);
 +    }
 +    if (pd->confdata.flags.aiv) {
 +        av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
 +    }
 +    if (pd->confdata.flags.cbp) {
 +    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
 +    }
 +    if (pd->confdata.flags.mv0) {
 +        av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
 +    }
 +    if (pd->confdata.flags.naq) {
 +        av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
 +    }
++
 +    char buf[1024];
 +#define set_dict_opt(val, opt) \
 +    snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
 +    av_dict_set(&(pd->ff_opts), opt, buf, 0)
 +#define set_dict_float_opt(val, opt) \
 +    snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
 +    av_dict_set(&(pd->ff_opts), opt, buf, 0)
++
 +    set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
 +    set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
 +    set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
 +    set_dict_opt(inter_quant_bias, "pbias");
 +    set_dict_opt(intra_quant_bias, "ibias");
 +    set_dict_opt(me_method, "me_method");
 +    set_dict_opt(scenechange_factor, "sc_factor");
 +    set_dict_opt(rc_strategy, "rc_strategy");
 +    set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
 +    set_dict_float_opt(rc_qsquish, "qsquish");
 +    set_dict_float_opt(border_masking, "border_mask");
+ }
  #undef SET_FLAG
-@@ -1116,8 +1156,6 @@ static int tc_lavc_read_config(TCLavcPri
+@@ -1116,17 +1177,15 @@ static int tc_lavc_read_config(TCLavcPri
          //  handled by transcode core
          //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
          //  handled by transcode core
 -        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
 -        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
          { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
          { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
          { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
-@@ -1150,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
+-        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
-         { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
++        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
          { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
          { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
          { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
          { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
 -        { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
 +        { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
          { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
          { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
          { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
@@ -1137,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
          { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
          { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
          { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
 -        { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
 +        { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
          { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
          { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
          { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
@@ -1147,11 +1206,11 @@ static int tc_lavc_read_config(TCLavcPri
          { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
          //  { "vrc_eq",     }, // not yet supported
          { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
 -        { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
 +        { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
          //  { "vrc_init_occupancy",   }, // not yet supported
-         { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+-        { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
 -        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
 -        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
 +        { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
 +        { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
 +        { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
          { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
          { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
          { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-@@ -1177,25 +1215,25 @@ static int tc_lavc_read_config(TCLavcPri
+@@ -1161,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
-         { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
-         { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+         { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
          { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
 -        { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
 +        { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
          { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
          { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
          { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
@@ -1174,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
          { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
          { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
          { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
 -        { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
 -        { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
 +        { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
 +        { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
          { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
 -        { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
 +        { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
          { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
          { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
+-        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
 -        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-+        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
          { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
 -        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
-+        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+-        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
-         { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
+-        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
          { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
 -        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
 +        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
 +        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
 +        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
 +        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
 +        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
 +        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
 +        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
 +        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
          { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
  #else
-         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
+-        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
 +        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
  #endif
 -        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
 -        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
 -        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
 +        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
 +        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
++        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
          { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
-@@ -1345,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
+ #else
          { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
  #endif
 -        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
 -        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
 -        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
 +        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
 +        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
 +        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
          //  { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet  supported
          /* End of the config file */
@@ -1345,12 +1404,14 @@ static int tc_lavc_configure(TCModuleIns
      pd = self->userdata;
 +    pd->ff_opts = NULL;
++
      pd->flush_flag = vob->encoder_flush;
      /* FIXME: move into core? */
-@@ -1387,7 +1427,7 @@ static int tc_lavc_configure(TCModuleIns
+     TC_INIT_LIBAVCODEC;
 -    avcodec_get_frame_defaults(&pd->ff_venc_frame);
 +    av_frame_unref(&pd->ff_venc_frame);
      /*
       * auxiliary config data needs to be blanked too
       * before any other operation
@@ -1387,7 +1448,7 @@ static int tc_lavc_configure(TCModuleIns
                      pd->confdata.thread_count,
                      (pd->confdata.thread_count > 1) ?"s" :"");
+     }
 -    avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
 +    pd->ff_vcontext.thread_count = pd->confdata.thread_count;
      pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
      if (pd->ff_vcodec == NULL) {
-@@ -1397,11 +1437,11 @@ static int tc_lavc_configure(TCModuleIns
+@@ -1397,11 +1458,11 @@ static int tc_lavc_configure(TCModuleIns
+     }
      TC_LOCK_LIBAVCODEC;
 -    ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
 +    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
      TC_UNLOCK_LIBAVCODEC;
      if (ret < 0) {
 -        tc_log_error(MOD_NAME, "avcodec_open() failed");
 +        tc_log_error(MOD_NAME, "avcodec_open2() failed");
          goto failed;
+     }
      /* finally, pass up the extradata, if any */
@@ -1483,6 +1544,8 @@ static int tc_lavc_encode_video(TCModule
                                  vframe_list_t *outframe)
+ {
      TCLavcPrivateData *pd = NULL;
 +    AVPacket pkt;
 +    int ret, got_packet = 0;
      TC_MODULE_SELF_CHECK(self, "encode_video");
@@ -1497,12 +1560,15 @@ static int tc_lavc_encode_video(TCModule
      pd->pre_encode_video(pd, inframe);
 +    av_init_packet(&pkt);
 +    pkt.data = outframe->video_buf;
 +    pkt.size = inframe->video_size;
++
      TC_LOCK_LIBAVCODEC;
 -    outframe->video_len = avcodec_encode_video(&pd->ff_vcontext,
 -                                               outframe->video_buf,
 -                                               inframe->video_size,
 -                                               &pd->ff_venc_frame);
 +    ret = avcodec_encode_video2(&pd->ff_vcontext,   &pkt,
 +    				&pd->ff_venc_frame, &got_packet);
      TC_UNLOCK_LIBAVCODEC;
 +    outframe->video_len = ret ? ret : pkt.size;
      if (outframe->video_len < 0) {
          tc_log_warn(MOD_NAME, "encoder error: size (%i)",

 @@ -1,137 +1,307 @@
-$NetBSD: patch-export_export_ffmpeg.c,v 1.2 2015/11/21 17:14:26 adam Exp $
+$NetBSD: patch-export_export_ffmpeg.c,v 1.3 2019/12/29 10:23:53 markd Exp $
-Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).
+Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 --- export/export_ffmpeg.c.orig	2011-11-19 16:50:27.000000000 +0000
 +++ export/export_ffmpeg.c
 @@ -122,6 +122,7 @@ static uint8_t             *img_buffer =
  static AVFrame             *lavc_convert_frame = NULL;
  static AVCodec             *lavc_venc_codec = NULL;
 +static AVDictionary        *lavc_venc_opts = NULL;
  static AVFrame             *lavc_venc_frame = NULL;
  static AVCodecContext      *lavc_venc_context;
  static avi_t               *avifile = NULL;
 @@ -180,7 +181,7 @@ static char *tc_strchrnul(const char *s,
  /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
 -#include <libavcodec/opt.h>
 +#include <libavutil/opt.h>
  #include <libavutil/avstring.h>
  #include <libswscale/swscale.h>
-@@ -470,7 +471,6 @@ MOD_init
+@@ -249,9 +250,9 @@ int opt_default(const char *opt, const c
      for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
  		/* GLUE: +if */
  		if (type == AVMEDIA_TYPE_VIDEO) {
 -        const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
 -        if(o2)
 -            ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
 +        o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
 +        if(o)
 +            ret = av_opt_set(avcodec_opts[type], opt, arg, 0);
  		/* GLUE: +if */
+ 		}
+     }
@@ -266,7 +267,10 @@ int opt_default(const char *opt, const c
          if(opt[0] == 'a')
              ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
          else */ if(opt[0] == 'v')
 -            ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o);
 +	{
 +	    o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0);
 +            ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0);
 +	}
  		/* GLUE: disabling
          else if(opt[0] == 's')
              ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o);
@@ -470,7 +474,6 @@ MOD_init
+     }
      TC_LOCK_LIBAVCODEC;
 -    avcodec_init();
      avcodec_register_all();
      TC_UNLOCK_LIBAVCODEC;
-@@ -486,7 +486,7 @@ MOD_init
+@@ -486,11 +489,11 @@ MOD_init
  		            codec->name, codec->fourCC, codec->comments);
+     }
 -    lavc_venc_context = avcodec_alloc_context();
 -    lavc_venc_frame   = avcodec_alloc_frame();
 +    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
-     lavc_venc_frame   = avcodec_alloc_frame();
++    lavc_venc_frame   = av_frame_alloc();
 -    lavc_convert_frame= avcodec_alloc_frame();
 -    size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
 +    lavc_convert_frame= av_frame_alloc();
 +    size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
      enc_buffer = tc_malloc(size);
-     lavc_convert_frame= avcodec_alloc_frame();
+     if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) {
-@@ -634,7 +634,7 @@ MOD_init
+@@ -634,7 +637,7 @@ MOD_init
          lavc_param_rc_max_rate = 2516;
          lavc_param_rc_buffer_size = 224 * 8;
          lavc_param_rc_buffer_aggressivity = 99;
 -        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
 +        lavc_param_scan_offset = 1;
          break;
-@@ -674,7 +674,7 @@ MOD_init
+@@ -674,7 +677,7 @@ MOD_init
          lavc_param_rc_buffer_size = 224 * 8;
          lavc_param_rc_buffer_aggressivity = 99;
 -        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
 +        lavc_param_scan_offset = 1;
          break;
-@@ -838,8 +838,13 @@ MOD_init
+@@ -828,18 +831,35 @@ MOD_init
      lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
      lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
      lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
 -    lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
 -    lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
      lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
      lavc_venc_context->qcompress          = lavc_param_vqcompress;
      lavc_venc_context->qblur              = lavc_param_vqblur;
      lavc_venc_context->max_b_frames       = lavc_param_vmax_b_frames;
      lavc_venc_context->b_quant_factor     = lavc_param_vb_qfactor;
 -    lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
      lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
      lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
 -    lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
 -    lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
++
 +    char buf[1024];
 +#define set_dict_opt(val, opt) \
 +	snprintf(buf, sizeof(buf), "%i", val); \
 +	av_dict_set(&lavc_venc_opts, opt, buf, 0)
 +#define set_dict_float_opt(val, opt) \
 +	snprintf(buf, sizeof(buf), "%f", val); \
 +	av_dict_set(&lavc_venc_opts, opt, buf, 0)
 +    set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
 +    set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
 +    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
 +    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
 +    set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
 +    set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
 +    set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
 +    set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
 +    set_dict_opt(lavc_param_rc_eq, "rc_eq");
 +    set_dict_opt(lavc_param_vme, "me_method");
 +    set_dict_opt(lavc_param_ibias, "ibias");
 +    set_dict_opt(lavc_param_pbias, "pbias");
 +    set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
 +    set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
      lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
      if (lavc_param_packet_size)
-@@ -870,7 +875,7 @@ MOD_init
+@@ -848,15 +868,9 @@ MOD_init
      lavc_venc_context->strict_std_compliance= lavc_param_strict;
      lavc_venc_context->i_quant_factor     = lavc_param_vi_qfactor;
      lavc_venc_context->i_quant_offset     = lavc_param_vi_qoffset;
 -    lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
 -    lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
 -    lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
 -    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
      lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
      lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
      lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 1024;
 -    lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
 -    lavc_venc_context->rc_initial_cplx    = lavc_param_rc_initial_cplx;
      lavc_venc_context->debug              = lavc_param_debug;
      lavc_venc_context->last_predictor_count= lavc_param_last_pred;
      lavc_venc_context->pre_me             = lavc_param_pre_me;
@@ -864,13 +878,11 @@ MOD_init
      lavc_venc_context->pre_dia_size       = lavc_param_pre_dia_size;
      lavc_venc_context->me_subpel_quality  = lavc_param_me_subpel_quality;
      lavc_venc_context->me_range           = lavc_param_me_range;
 -    lavc_venc_context->intra_quant_bias   = lavc_param_ibias;
 -    lavc_venc_context->inter_quant_bias   = lavc_param_pbias;
      lavc_venc_context->coder_type         = lavc_param_coder;
      lavc_venc_context->context_model      = lavc_param_context;
      lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
      lavc_venc_context->noise_reduction    = lavc_param_noise_reduction;
 -    lavc_venc_context->inter_threshold    = lavc_param_inter_threshold;
 +    set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
      lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
      lavc_venc_context->skip_top           = lavc_param_skip_top;
      lavc_venc_context->skip_bottom        = lavc_param_skip_bottom;
-@@ -887,7 +892,7 @@ MOD_init
+@@ -887,7 +899,7 @@ MOD_init
  		    lavc_venc_context->thread_count);
+     }
 -    avcodec_thread_init(lavc_venc_context, lavc_param_threads);
 +    lavc_venc_context->thread_count = lavc_param_threads;
      if (lavc_param_intra_matrix) {
          char *tmp;
-@@ -1065,15 +1070,12 @@ MOD_init
+@@ -1061,19 +1073,20 @@ MOD_init
      lavc_venc_context->ildct_cmp  = lavc_param_ildct_cmp;
      lavc_venc_context->dia_size   = lavc_param_dia_size;
      lavc_venc_context->flags |= lavc_param_qpel;
 -    lavc_venc_context->flags |= lavc_param_gmc;
 +    if(lavc_param_gmc)
 +        av_dict_set(&lavc_venc_opts, "gmc", "1", 0);
      lavc_venc_context->flags |= lavc_param_closedgop;
      lavc_venc_context->flags |= lavc_param_trunc;
      lavc_venc_context->flags |= lavc_param_aic;
 -    lavc_venc_context->flags |= lavc_param_umv;
      lavc_venc_context->flags |= lavc_param_v4mv;
 -    lavc_venc_context->flags |= lavc_param_data_partitioning;
 -    lavc_venc_context->flags |= lavc_param_cbp;
-+    if(lavc_param_cbp)
+-    lavc_venc_context->flags |= lavc_param_mv0;
 +    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
      lavc_venc_context->flags |= lavc_param_mv0;
 -    lavc_venc_context->flags |= lavc_param_qp_rd;
 -    lavc_venc_context->flags |= lavc_param_scan_offset;
 -    lavc_venc_context->flags |= lavc_param_ss;
 -    lavc_venc_context->flags |= lavc_param_alt;
 +    if(lavc_param_cbp)
 +    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
 +    if(lavc_param_mv0)
 +        av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0);
 +    if(lavc_param_qp_rd)
 +    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
 +    if (lavc_param_normalize_aqp)
 +    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
      lavc_venc_context->flags |= lavc_param_ilme;
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
      lavc_venc_context->flags |= lavc_param_trell;
-@@ -1203,9 +1205,8 @@ MOD_init
+@@ -1082,9 +1095,7 @@ MOD_init
  #endif
-     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+     if (lavc_param_gray)
 -        lavc_venc_context->flags |= CODEC_FLAG_GRAY;
 -    if (lavc_param_normalize_aqp)
 -        lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
 +        lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
      switch(vob->encode_fields) {
      case TC_ENCODE_FIELDS_TOP_FIRST:
@@ -1102,9 +1113,9 @@ MOD_init
+     }
      lavc_venc_context->flags |= interlacing_active ?
 -        CODEC_FLAG_INTERLACED_DCT : 0;
 +        AV_CODEC_FLAG_INTERLACED_DCT : 0;
      lavc_venc_context->flags |= interlacing_active ?
 -        CODEC_FLAG_INTERLACED_ME : 0;
 +        AV_CODEC_FLAG_INTERLACED_ME : 0;
      lavc_venc_context->flags |= lavc_param_psnr;
      do_psnr = lavc_param_psnr;
@@ -1112,7 +1123,7 @@ MOD_init
      lavc_venc_context->prediction_method = lavc_param_prediction_method;
      if(is_huffyuv)
 -        lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
 +        lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
      else
+     {
          switch(pix_fmt)
@@ -1121,18 +1132,18 @@ MOD_init
              case CODEC_RGB:
+             {
                  if(is_mjpeg)
 -                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;
 +                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P;
                  else
 -                    lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
 +                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P;
                  break;
+             }
              case CODEC_YUV422:
+             {
                  if(is_mjpeg)
 -                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P;
 +                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P;
                  else
 -                    lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
 +                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
                  break;
+             }
@@ -1151,7 +1162,7 @@ MOD_init
                    "encoding.");
            return TC_EXPORT_ERROR;
+         }
 -        lavc_venc_context->flags |= CODEC_FLAG_PASS1;
 +        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
          stats_file = fopen(vob->divxlogfile, "w");
          if (stats_file == NULL){
            tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
@@ -1165,7 +1176,7 @@ MOD_init
                    "encoding.");
            return TC_EXPORT_ERROR;
+         }
 -        lavc_venc_context->flags |= CODEC_FLAG_PASS2;
 +        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
          stats_file= fopen(vob->divxlogfile, "r");
          if (stats_file==NULL){
            tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
@@ -1196,16 +1207,14 @@ MOD_init
          break;
        case 3:
          /* fixed qscale :p */
 -        lavc_venc_context->flags   |= CODEC_FLAG_QSCALE;
 +        lavc_venc_context->flags   |= AV_CODEC_FLAG_QSCALE;
          lavc_venc_frame->quality  = vob->divxbitrate;
          break;
+     }
 -    lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+-
  	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
 -	if (lavc_param_video_preset) {
 +	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
  		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
  		video_codec_name = ffmpeg_codec_name(codec->name);
-@@ -1241,20 +1242,39 @@ MOD_init
+@@ -1241,20 +1250,39 @@ MOD_init
+ 		}
+ 	}
 +    if (lavc_param_scan_offset) {
 +      av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
 +    }
++
 +    if (lavc_param_ss) {
 +      av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
 +    }
++
 +    if (lavc_param_alt) {
 +      av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
 @@ -154,13 +324,70 @@ Fixes building against FFmpeg version >=
      if (ret < 0) {
        tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
        return TC_EXPORT_ERROR;
+     }
 -    if (lavc_venc_context->codec->encode == NULL) {
 +    if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
        tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
 -              "(lavc_venc_context->codec->encode == NULL)");
 +              "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
        return TC_EXPORT_ERROR;
+     }
@@ -1574,6 +1602,8 @@ MOD_encode
    int out_size;
    const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
 +  AVPacket pkt;
 +  int ret, got_packet = 0;
    if (param->flag == TC_VIDEO) {
@@ -1598,7 +1628,7 @@ MOD_encode
  	        	YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT,
  			                	lavc_venc_context->width, lavc_venc_context->height);
                  avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
 -                               PIX_FMT_YUV422P, lavc_venc_context->width,
 +                               AV_PIX_FMT_YUV422P, lavc_venc_context->width,
                                 lavc_venc_context->height);
          		/* FIXME: can't use tcv_convert (see decode_lavc.c) */
                  ac_imgconvert(src, IMG_YUV_DEFAULT,
@@ -1628,7 +1658,7 @@ MOD_encode
  		                		lavc_venc_context->width,
                                  lavc_venc_context->height);
                  avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
 -                               PIX_FMT_YUV420P, lavc_venc_context->width,
 +                               AV_PIX_FMT_YUV420P, lavc_venc_context->width,
                                 lavc_venc_context->height);
                  ac_imgconvert(src, IMG_YUV422P,
                                lavc_venc_frame->data, IMG_YUV420P,
@@ -1639,7 +1669,7 @@ MOD_encode
          case CODEC_RGB:
              avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
 -                           PIX_FMT_YUV420P, lavc_venc_context->width,
 +                           AV_PIX_FMT_YUV420P, lavc_venc_context->width,
                             lavc_venc_context->height);
      	    ac_imgconvert(&param->buffer, IMG_RGB_DEFAULT,
                                lavc_venc_frame->data, IMG_YUV420P,
@@ -1652,13 +1682,17 @@ MOD_encode
                return TC_EXPORT_ERROR;
+     }
 +    av_init_packet(&pkt);
 +    pkt.data = enc_buffer;
 +    pkt.size = size;
      TC_LOCK_LIBAVCODEC;
 -    out_size = avcodec_encode_video(lavc_venc_context,
 -                                    enc_buffer, size,
 -                                    lavc_venc_frame);
 +    ret = avcodec_encode_video2(lavc_venc_context, &pkt,
 +                                    lavc_venc_frame, &got_packet);
      TC_UNLOCK_LIBAVCODEC;
 +    out_size = ret ? ret : pkt.size;
++
      if (out_size < 0) {
        tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
        return TC_EXPORT_ERROR;

 @@ -1,73 +1,137 @@
-$NetBSD: patch-export_ffmpeg_cfg.c,v 1.2 2015/11/21 17:14:26 adam Exp $
+$NetBSD: patch-export_ffmpeg_cfg.c,v 1.3 2019/12/29 10:23:53 markd Exp $
-Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).
+Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 --- export/ffmpeg_cfg.c.orig	2011-11-19 16:50:27.000000000 +0000
 +++ export/ffmpeg_cfg.c
 @@ -34,8 +34,6 @@ int lavc_param_vme = 4;
  //int lavc_param_vqscale = 0;
  //int lavc_param_vqmin = 2;
  //int lavc_param_vqmax = 31;
 -int lavc_param_mb_qmin = 2;
 -int lavc_param_mb_qmax = 31;
  int lavc_param_lmin = 2;
  int lavc_param_lmax = 31;
  int lavc_param_vqdiff = 3;
@@ -95,8 +93,8 @@ int lavc_param_last_pred= 0;
  int lavc_param_pre_me= 1;
  int lavc_param_me_subpel_quality= 8;
  int lavc_param_me_range=0;
 -int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
 -int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
 +int lavc_param_ibias=0;
 +int lavc_param_pbias=0;
  int lavc_param_coder=0;
  int lavc_param_context=0;
  char *lavc_param_intra_matrix = NULL;
 @@ -126,7 +124,7 @@ int lavc_param_gmc = 0;
  //int lavc_param_atag = 0;
  //int lavc_param_abitrate = 224;
 -char *lavc_param_video_preset = "medium";
 +char *lavc_param_video_preset = "none";
  char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
  TCConfigEntry lavcopts_conf[]={
-@@ -143,8 +141,6 @@ TCConfigEntry lavcopts_conf[]={
+@@ -138,20 +136,18 @@ TCConfigEntry lavcopts_conf[]={
      {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
      {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
      {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
 -    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
 +    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
      {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
  //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
  //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
  //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
 -    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
 -    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
      {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
      {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
      {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
      {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
      {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
      {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
 -    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
 +    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX},
  //    {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
      {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
      {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
 @@ -160,9 +156,9 @@ TCConfigEntry lavcopts_conf[]={
      {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
      {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
      {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
 -    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
 +    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
  //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
 -    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-+    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
++    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
      {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
      {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
      {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,21 +207,21 @@ TCConfigEntry lavcopts_conf[]={
+@@ -188,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
      {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
      {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
      {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
 -    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
 +    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
      {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
      {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
      {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
@@ -196,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
      {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
      {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
      {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
 -    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
 +    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 -    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
 +    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
  #else
-     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
+     {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
  #endif
@@ -207,32 +203,32 @@ TCConfigEntry lavcopts_conf[]={
      {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
      {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 -    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
 +    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
  #else
 -    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
 +    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
  #endif
 -    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
 +    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
      {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
      {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
      {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
      {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
      {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
      {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
 -    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
 -    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
 +    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
++    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
      {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
 -    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
 +    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
      {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
 -    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
 -    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
 -    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
 -    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
 +    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
 +    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
 +    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
++    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME},
      {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
      {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
      {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
 -    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
 -    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
 -    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
 +    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
 +    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
 +    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
      {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
      {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
      {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},

 @@ -1,33 +1,211 @@
-$NetBSD: patch-import_import_ffmpeg.c,v 1.2 2015/11/21 17:14:26 adam Exp $
+$NetBSD: patch-import_import_ffmpeg.c,v 1.3 2019/12/29 10:23:53 markd Exp $
-Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).
+Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 --- import/import_ffmpeg.c.orig	2011-11-19 16:50:27.000000000 +0000
 +++ import/import_ffmpeg.c
@@ -59,51 +59,51 @@ struct ffmpeg_codec {
  // fourCC to ID mapping taken from MPlayer's codecs.conf
  static struct ffmpeg_codec ffmpeg_codecs[] = {
 -  {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
 +  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
      {"MP41", "DIV1", ""}},
 -  {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
 +  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
      {"MP42", "DIV2", ""}},
 -  {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
 +  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
      {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
 -  {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
 +  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
      {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
 -  {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
 +  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
      {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
 -  {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
 +  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
      {"MPG1", ""}},
 -  {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
 +  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
      {"DVSD", ""}},
 -  {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
 +  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
      {"WMV1", ""}},
 -  {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
 +  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
      {"WMV2", ""}},
 -  {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
 +  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
      {"HFYU", ""}},
 -  {CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
 +  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
      {"I263", ""}},
 -  {CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
 +  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
      {"H263", "U263", "VIV1", ""}},
 -  {CODEC_ID_H264, TC_CODEC_H264, "h264",
 +  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
      {"H264", "h264", "X264", "x264", "avc1", ""}},
 -  {CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
 +  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
      {"RV10", "RV13", ""}},
 -  {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
 +  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
      {"SVQ1", ""}},
 -  {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
 +  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
      {"SVQ3", ""}},
 -  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
 +  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
      {"MPG2", ""}},
 -  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
 +  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
      {"MPG2", ""}},
 -  {CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
 +  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
      {"ASV1", ""}},
 -  {CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
 +  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
      {"ASV2", ""}},
 -  {CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
 +  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
      {"FFV1", ""}},
 -  {CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
 +  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
      {"I420", "IYUV", ""}},
 -  {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
 +  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
      {"Y42B", ""}},
    {0, TC_CODEC_UNKNOWN, NULL, {""}}};
 @@ -302,7 +302,7 @@ do_avi:
      // Set these to the expected values so that ffmpeg's decoder can
      // properly detect interlaced input.
 -    lavc_dec_context = avcodec_alloc_context();
 +    lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
      if (lavc_dec_context == NULL) {
        tc_log_error(MOD_NAME, "Could not allocate enough memory.");
        return TC_IMPORT_ERROR;
-@@ -314,7 +314,7 @@ do_avi:
+@@ -310,11 +310,11 @@ do_avi:
      lavc_dec_context->width  = x_dim;
      lavc_dec_context->height = y_dim;
 -    if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
 +    if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
      lavc_dec_context->error_resilience  = 2;
  #else
 -    lavc_dec_context->error_recognition = 2;
 +    lavc_dec_context->err_recognition = 2;
  #endif
      lavc_dec_context->error_concealment = 3;
      lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
@@ -324,13 +324,13 @@ do_avi:
      // XXX: some codecs need extra data
      switch (codec->id)
+     {
 -      case CODEC_ID_MJPEG: extra_data_size  = 28; break;
 -      case CODEC_ID_LJPEG: extra_data_size  = 28; break;
 -      case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
 -      case CODEC_ID_ASV1: extra_data_size = 8; break;
 -      case CODEC_ID_ASV2: extra_data_size = 8; break;
 -      case CODEC_ID_WMV1: extra_data_size = 4; break;
 -      case CODEC_ID_WMV2: extra_data_size = 4; break;
 +      case AV_CODEC_ID_MJPEG: extra_data_size  = 28; break;
 +      case AV_CODEC_ID_LJPEG: extra_data_size  = 28; break;
 +      case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
 +      case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
 +      case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
 +      case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
 +      case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
        default: extra_data_size = 0; break;
+     }
 @@ -344,7 +344,7 @@ do_avi:
+     }
      TC_LOCK_LIBAVCODEC;
 -    ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
 +    ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
      TC_UNLOCK_LIBAVCODEC;
      if (ret < 0) {
        tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
@@ -360,7 +360,7 @@ do_avi:
          frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
  	// we adapt the color space
 -        if(codec->id == CODEC_ID_MJPEG) {
 +        if(codec->id == AV_CODEC_ID_MJPEG) {
  	  enable_levels_filter();
+         }
          break;
@@ -434,7 +434,7 @@ do_dv:
+       }
        // we adapt the color space
 -      if(codec->id == CODEC_ID_MJPEG) {
 +      if(codec->id == AV_CODEC_ID_MJPEG) {
          enable_levels_filter();
+       }
@@ -504,13 +504,13 @@ MOD_decode {
        int bkey = 0;
        // check for keyframes
 -      if (codec->id == CODEC_ID_MSMPEG4V3) {
 +      if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
  	if (divx3_is_key(buffer)) bkey = 1;
+       }
 -      else if (codec->id == CODEC_ID_MPEG4) {
 +      else if (codec->id == AV_CODEC_ID_MPEG4) {
  	if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
+       }
 -      else if (codec->id == CODEC_ID_MJPEG) {
 +      else if (codec->id == AV_CODEC_ID_MJPEG) {
  	bkey = 1;
+       }
@@ -580,8 +580,8 @@ retry:
      // Convert avcodec image to our internal YUV or RGB format
      switch (lavc_dec_context->pix_fmt) {
 -      case PIX_FMT_YUVJ420P:
 -      case PIX_FMT_YUV420P:
 +      case AV_PIX_FMT_YUVJ420P:
 +      case AV_PIX_FMT_YUV420P:
          src_fmt = IMG_YUV420P;
          YUV_INIT_PLANES(src_planes, frame, src_fmt,
                          lavc_dec_context->width, lavc_dec_context->height);
@@ -612,7 +612,7 @@ retry:
+ 	}
          break;
 -      case PIX_FMT_YUV411P:
 +      case AV_PIX_FMT_YUV411P:
          src_fmt = IMG_YUV411P;
          YUV_INIT_PLANES(src_planes, frame, src_fmt,
                          lavc_dec_context->width, lavc_dec_context->height);
@@ -640,8 +640,8 @@ retry:
+         }
          break;
 -      case PIX_FMT_YUVJ422P:
 -      case PIX_FMT_YUV422P:
 +      case AV_PIX_FMT_YUVJ422P:
 +      case AV_PIX_FMT_YUV422P:
          src_fmt = IMG_YUV422P;
          YUV_INIT_PLANES(src_planes, frame, src_fmt,
                          lavc_dec_context->width, lavc_dec_context->height);
@@ -669,8 +669,8 @@ retry:
+         }
  	break;
 -      case PIX_FMT_YUVJ444P:
 -      case PIX_FMT_YUV444P:
 +      case AV_PIX_FMT_YUVJ444P:
 +      case AV_PIX_FMT_YUV444P:
          src_fmt = IMG_YUV444P;
          YUV_INIT_PLANES(src_planes, frame, src_fmt,
                          lavc_dec_context->width, lavc_dec_context->height);

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.118 2019/07/21 22:25:28 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2019/12/29 10:23:53 markd Exp $
 DISTNAME=	transcode-1.1.7
-PKGREVISION=	36
+PKGREVISION=	37
 CATEGORIES=	multimedia
 MASTER_SITES=	http://bitbucket.org/france/transcode-tcforge/downloads/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://bitbucket.org/achurch_/transcode/wiki/Home
 # or https://bitbucket.org/france/transcode-tcforge/wiki/Home
 COMMENT=	Command line video-stream processing tool
 LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		awk:run gmake pkg-config
 @@ -45,27 +45,27 @@ LIBS+=			${LIBOSSAUDIO}
 .endif
 .include "options.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/liblqr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .endif
 .include "../../mk/jpeg.buildlink3.mk"

 @@ -1,27 +1,28 @@
-$NetBSD: distinfo,v 1.26 2016/05/16 19:41:17 adam Exp $
+$NetBSD: distinfo,v 1.27 2019/12/29 10:23:53 markd Exp $
 SHA1 (transcode-1.1.7.tar.bz2) = e35df68b960eb56ef0a59a4cdbed1491be56aee6
 RMD160 (transcode-1.1.7.tar.bz2) = faa854acbbfd52faaa216505176f94d756d77841
 SHA512 (transcode-1.1.7.tar.bz2) = d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
 Size (transcode-1.1.7.tar.bz2) = 2183627 bytes
 SHA1 (patch-avilib_avidump.c) = 640aac6fc274a685b1847b48870b37b2c2ab1e88
 SHA1 (patch-configure) = 38418cd91750f55828124b5895d42d3af5c2d56a
-SHA1 (patch-encode_encode_lavc.c) = c33f40dab212b601e5d808d972d132db4eee2d2e
+SHA1 (patch-encode_encode_lavc.c) = 5ce01220933d58ab09a58c37146da290a3d91164
-SHA1 (patch-export_aud__aux.c) = 84b774d13e363721db692b1edc53589e165b094e
+SHA1 (patch-export_aud__aux.c) = 437ffde84123eccfe496c478a9db0066208fe256
 SHA1 (patch-export_export__im.c) = 3a4f08d548cdebdfa618aeff2df398bd61002120
-SHA1 (patch-export_export_ffmpeg.c) = 4367d16ba83ccc5c868f0dc470dcd0b64770b185
+SHA1 (patch-export_export_ffmpeg.c) = 2cc6100ab5e837b8d3fe66ec55c88962e6fbfb26
-SHA1 (patch-export_ffmpeg_cfg.c) = 216f7970f3885a3f7fc8c229e4d1950cd6430cff
+SHA1 (patch-export_ffmpeg_cfg.c) = d1678b2b6bdd2a9353d1fb34d72c2cc2d1aa1fa4
 SHA1 (patch-export_ffmpeg_cfg.h) = 7cf230de948de004cc0500f0ae2511561081e952
 SHA1 (patch-filter_filter__compare.c) = b866aa3f36607bee87aad4eb7023b0e5087b1c25
 SHA1 (patch-filter_filter__logo.c) = 4cff9a4123797d3a25df17b22f3922260ed3a7d4
 SHA1 (patch-filter_filter__logoaway.c) = 252986a1e3ce9969e97bfeedd63bec6e3cf6273c
 SHA1 (patch-filter_filter__pp.c) = a7a3f9c49e65e87bed343dd2d045457341e42114
 SHA1 (patch-filter_filter__resample.c) = 9e8176070682984b4f7f0cc29d21437ff5ba4710
 SHA1 (patch-filter_subtitler_load_font.c) = 2c496c63f4fe27190761d170cc825633eb63c11f
-SHA1 (patch-import_decode_lavc.c) = adf9274c5085012adcfeeb2f2366600155f0994c
+SHA1 (patch-import_decode_lavc.c) = 37c172b40858028592ced6a35f19fdd2873a07c6
 SHA1 (patch-import_import__im.c) = 30fdb4ce905c0bdd959964b1455f31823b681e9e
 SHA1 (patch-import_import__imlist.c) = 677ffc2c4ed48ab1e9f4f3f4a28f53b368ae7651
-SHA1 (patch-import_import_ffmpeg.c) = bbbbdec6a1c20a9c02a1e2ef4cca10919eb2854c
+SHA1 (patch-import_import_ffmpeg.c) = 601ff0f67727c7dc3bdad8c5c43a8b8b4baae5ea
 SHA1 (patch-import_nuv_import__nuv.c) = e4a57c29b97b23aed068c06a2ed29dd9e29a9919
-SHA1 (patch-import_probe_ffmpeg.c) = 6bbf65b513e999ac770bafc6aa9b508bfdb5ae15
+SHA1 (patch-import_probe_ffmpeg.c) = eabbdbc2ffad5da51cb77547ac6a3f92c7bafcdb
 SHA1 (patch-import_probe_im.c) = 27bce069c78e5eee94c14d3f5f03cc14145f85ac
 SHA1 (patch-libtc_tcavcodec.h) = 6fcef1e338e53c974b295b1a10b2cb06e6fcfbd3

 @@ -1,35 +1,49 @@
-$NetBSD: patch-import_probe_ffmpeg.c,v 1.2 2015/11/21 17:14:26 adam Exp $
+$NetBSD: patch-import_probe_ffmpeg.c,v 1.3 2019/12/29 10:23:53 markd Exp $
-Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).
+Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 --- import/probe_ffmpeg.c.orig	2011-11-19 16:50:27.000000000 +0000
 +++ import/probe_ffmpeg.c
@@ -51,8 +51,8 @@ static void translate_info(const AVForma
              info->bitrate = st->codec->bit_rate / 1000;
              info->width = st->codec->width;
              info->height = st->codec->height;
 -            if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
 -                info->fps = av_q2d(st->r_frame_rate);
 +            if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
 +                info->fps = av_q2d(st->avg_frame_rate);
              } else {
                  /* watch out here */
                  info->fps = 1.0/av_q2d(st->codec->time_base);
 @@ -99,8 +99,8 @@ void probe_ffmpeg(info_t *ipipe)
      TC_INIT_LIBAVCODEC;
 -    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
 -                             NULL, 0, NULL);
 +    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
 +                             NULL, NULL);
      if (ret != 0) {
          tc_log_error(__FILE__, "unable to open '%s'"
                                 " (libavformat failure)",
 @@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
          return;
+     }
 -    ret = av_find_stream_info(lavf_dmx_context);
 +    ret = avformat_find_stream_info(lavf_dmx_context, NULL);
      if (ret < 0) {
          tc_log_error(__FILE__, "unable to fetch informations from '%s'"
                                 " (libavformat failure)",
-@@ -120,7 +120,7 @@ void probe_ffmpeg(info_t *ipipe)
+@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe)
      translate_info(lavf_dmx_context, ipipe->probe_info);
--    av_close_input_file(lavf_dmx_context);
++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
 +    avformat_close_input(&lavf_dmx_context);
 +#else
      av_close_input_file(lavf_dmx_context);
 +#endif
      return;
+ }

 @@ -1,24 +1,104 @@
-$NetBSD: patch-export_aud__aux.c,v 1.1 2015/11/21 17:14:26 adam Exp $
+$NetBSD: patch-export_aud__aux.c,v 1.2 2019/12/29 10:23:53 markd Exp $
-Fixes building against FFmpeg version >= 2.0.0 (gentoo patch).
+Fixes building against FFmpeg version >= 4.0.0 (gentoo patch).
 --- export/aud_aux.c.orig	2011-11-19 16:50:27.000000000 +0000
 +++ export/aud_aux.c
@@ -326,10 +326,10 @@ static int tc_audio_init_ffmpeg(vob_t *v
      switch (o_codec) {
        case   0x50:
 -        codeid = CODEC_ID_MP2;
 +        codeid = AV_CODEC_ID_MP2;
          break;
        case 0x2000:
 -        codeid = CODEC_ID_AC3;
 +        codeid = AV_CODEC_ID_AC3;
          break;
        default:
          tc_warn("cannot init ffmpeg with %x", o_codec);
 @@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
      //-- set parameters (bitrate, channels and sample-rate) --
      //--------------------------------------------------------
 -    avcodec_get_context_defaults(&mpa_ctx);
 +    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
  #if LIBAVCODEC_VERSION_MAJOR < 53
      mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
  #else
-@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+@@ -359,11 +359,11 @@ static int tc_audio_init_ffmpeg(vob_t *v
      //-- open codec --
      //----------------
      TC_LOCK_LIBAVCODEC;
 -    ret = avcodec_open(&mpa_ctx, mpa_codec);
 +    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
      TC_UNLOCK_LIBAVCODEC;
      if (ret < 0) {
          tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
 -                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
 +                (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3");
          return(TC_EXPORT_ERROR);
+     }
@@ -846,6 +846,9 @@ static int tc_audio_encode_ffmpeg(char *
  #ifdef HAVE_FFMPEG
      int  in_size, out_size;
      char *in_buf;
 +    int got_packet;
 +    AVPacket avpkt = { 0 };
 +    AVFrame *frame = av_frame_alloc();
      //-- input buffer and amount of bytes --
      in_size = aud_size;
@@ -866,10 +869,14 @@ static int tc_audio_encode_ffmpeg(char *
      ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed);
 +    frame->nb_samples = mpa_ctx.frame_size;
 +    avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)mpa_buf, mpa_bytes_pf, 1);
 +    avpkt.data = output;
 +    avpkt.size = OUTPUT_SIZE;
      TC_LOCK_LIBAVCODEC;
 -    out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
 -                    OUTPUT_SIZE, (short *)mpa_buf);
 +    out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet);
      TC_UNLOCK_LIBAVCODEC;
 +    out_size = avpkt.size;
      tc_audio_write(output, out_size, avifile);
          in_size -= bytes_needed;
@@ -884,6 +891,7 @@ static int tc_audio_encode_ffmpeg(char *
      ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail);
          mpa_buf_ptr += bytes_avail;
 +        av_frame_free(&frame);
          return (0);
+       }
      } //bytes availabe from last call?
@@ -893,10 +901,15 @@ static int tc_audio_encode_ffmpeg(char *
      //----------------------------------------------------
      while (in_size >= mpa_bytes_pf) {
 +      av_frame_unref(frame);
 +      frame->nb_samples = mpa_ctx.frame_size;
 +      avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, (const uint8_t *)in_buf, mpa_bytes_pf, 1);
 +      avpkt.data = output;
 +      avpkt.size = OUTPUT_SIZE;
        TC_LOCK_LIBAVCODEC;
 -      out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
 -                      OUTPUT_SIZE, (short *)in_buf);
 +      out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet);
        TC_UNLOCK_LIBAVCODEC;
 +      out_size = avpkt.size;
        tc_audio_write(output, out_size, avifile);
@@ -904,6 +917,8 @@ static int tc_audio_encode_ffmpeg(char *
        in_buf  += mpa_bytes_pf;
+     }
 +    av_frame_free(&frame);
++
      //-- hold rest of bytes in mpa-buffer --
      //--------------------------------------
      if (in_size > 0) {