Annotation of pkgsrc/multimedia/transcode/patches/patch-encode_encode_lavc.c, revision 1.1
1.1 ! markd 1: $NetBSD$
! 2:
! 3: Fix build with ffmpeg 0.11. gentoo patch from Brennan Shacklett
! 4:
! 5: --- encode/encode_lavc.c.orig 2011-11-19 16:50:27.000000000 +0000
! 6: +++ encode/encode_lavc.c
! 7: @@ -114,6 +114,7 @@ struct tclavcprivatedata_ {
! 8:
! 9: AVFrame ff_venc_frame;
! 10: AVCodecContext ff_vcontext;
! 11: + AVDictionary ** ff_opts;
! 12:
! 13: AVCodec *ff_vcodec;
! 14:
! 15: @@ -1036,14 +1037,10 @@ static void tc_lavc_dispatch_settings(TC
! 16: SET_FLAG(pd, mv0);
! 17: SET_FLAG(pd, cbp);
! 18: SET_FLAG(pd, qpel);
! 19: - SET_FLAG(pd, alt);
! 20: - SET_FLAG(pd, vdpart);
! 21: SET_FLAG(pd, naq);
! 22: SET_FLAG(pd, ilme);
! 23: SET_FLAG(pd, ildct);
! 24: SET_FLAG(pd, aic);
! 25: - SET_FLAG(pd, aiv);
! 26: - SET_FLAG(pd, umv);
! 27: SET_FLAG(pd, psnr);
! 28: SET_FLAG(pd, trell);
! 29: SET_FLAG(pd, gray);
! 30: @@ -1064,6 +1061,18 @@ static void tc_lavc_dispatch_settings(TC
! 31: pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
! 32: pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
! 33: }
! 34: + if (pd->confdata.flags.alt) {
! 35: + av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
! 36: + }
! 37: + if (pd->confdata.flags.vdpart) {
! 38: + av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
! 39: + }
! 40: + if (pd->confdata.flags.umv) {
! 41: + av_dict_set(pd->ff_opts, "umv", "1", 0);
! 42: + }
! 43: + if (pd->confdata.flags.aiv) {
! 44: + av_dict_set(pd->ff_opts, "aiv", "1", 0);
! 45: + }
! 46: }
! 47:
! 48: #undef SET_FLAG
! 49: @@ -1184,18 +1193,18 @@ static int tc_lavc_read_config(TCLavcPri
! 50: { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
! 51: { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
! 52: { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
! 53: - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
! 54: + { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
! 55: { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
! 56: { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
! 57: { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
! 58: - { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
! 59: + { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
! 60: #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
! 61: { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
! 62: #else
! 63: { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
! 64: #endif
! 65: - { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
! 66: - { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
! 67: + { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
! 68: + { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
! 69: { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
! 70: #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
! 71: { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
! 72: @@ -1387,7 +1396,7 @@ static int tc_lavc_configure(TCModuleIns
! 73: pd->confdata.thread_count,
! 74: (pd->confdata.thread_count > 1) ?"s" :"");
! 75: }
! 76: - avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
! 77: + pd->ff_vcontext.thread_count = pd->confdata.thread_count;
! 78:
! 79: pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
! 80: if (pd->ff_vcodec == NULL) {
! 81: @@ -1397,11 +1406,11 @@ static int tc_lavc_configure(TCModuleIns
! 82: }
! 83:
! 84: TC_LOCK_LIBAVCODEC;
! 85: - ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
! 86: + ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
! 87: TC_UNLOCK_LIBAVCODEC;
! 88:
! 89: if (ret < 0) {
! 90: - tc_log_error(MOD_NAME, "avcodec_open() failed");
! 91: + tc_log_error(MOD_NAME, "avcodec_open2() failed");
! 92: goto failed;
! 93: }
! 94: /* finally, pass up the extradata, if any */
CVSweb <webmaster@jp.NetBSD.org>