wok annotate transcode/stuff/ffmpeg4.u @ rev 23848

inkscape: update build_depends
author Richard Dunbar <mojo@slitaz.org>
date Sun Jun 14 23:18:03 2020 -0400 (2020-06-14)
parents
children
rev   line source
pascal@23070 1 Index: transcode-1.1.7/encode/encode_lavc.c
pascal@23070 2 ===================================================================
pascal@23070 3 --- transcode-1.1.7.orig/encode/encode_lavc.c
pascal@23070 4 +++ transcode-1.1.7/encode/encode_lavc.c
pascal@23070 5 @@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
pascal@23070 6 int luma_elim_threshold;
pascal@23070 7 int chroma_elim_threshold;
pascal@23070 8 int quantizer_noise_shaping;
pascal@23070 9 + int inter_quant_bias;
pascal@23070 10 + int intra_quant_bias;
pascal@23070 11 + int scenechange_factor;
pascal@23070 12 + int rc_strategy;
pascal@23070 13 + float rc_initial_cplx;
pascal@23070 14 + float rc_qsquish;
pascal@23070 15 + float border_masking;
pascal@23070 16
pascal@23070 17 /* same as above for flags */
pascal@23070 18 struct {
pascal@23070 19 @@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
pascal@23070 20 switch (vob->divxmultipass) {
pascal@23070 21 case 1:
pascal@23070 22 CAN_DO_MULTIPASS(multipass_flag);
pascal@23070 23 - pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
pascal@23070 24 + pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
pascal@23070 25 pd->stats_file = fopen(vob->divxlogfile, "w");
pascal@23070 26 if (pd->stats_file == NULL) {
pascal@23070 27 tc_log_error(MOD_NAME, "could not create 2pass log file"
pascal@23070 28 @@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
pascal@23070 29 break;
pascal@23070 30 case 2:
pascal@23070 31 CAN_DO_MULTIPASS(multipass_flag);
pascal@23070 32 - pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
pascal@23070 33 + pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
pascal@23070 34 pd->stats_file = fopen(vob->divxlogfile, "r");
pascal@23070 35 if (pd->stats_file == NULL){
pascal@23070 36 tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
pascal@23070 37 @@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
pascal@23070 38 break;
pascal@23070 39 case 3:
pascal@23070 40 /* fixed qscale :p */
pascal@23070 41 - pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
pascal@23070 42 + pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
pascal@23070 43 pd->ff_venc_frame.quality = vob->divxbitrate;
pascal@23070 44 break;
pascal@23070 45 }
pascal@23070 46 @@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
pascal@23070 47 pd->confdata.rc_buffer_size = 0;
pascal@23070 48 pd->confdata.lmin = 2;
pascal@23070 49 pd->confdata.lmax = 31;
pascal@23070 50 - pd->confdata.me_method = ME_EPZS;
pascal@23070 51 + pd->confdata.me_method = 0;
pascal@23070 52
pascal@23070 53 memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
pascal@23070 54 pd->confdata.turbo_setup = 0;
pascal@23070 55 @@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
pascal@23070 56 pd->ff_vcontext.me_range = 0;
pascal@23070 57 pd->ff_vcontext.mb_decision = 0;
pascal@23070 58 pd->ff_vcontext.scenechange_threshold = 0;
pascal@23070 59 - pd->ff_vcontext.scenechange_factor = 1;
pascal@23070 60 + pd->confdata.scenechange_factor = 1;
pascal@23070 61 pd->ff_vcontext.b_frame_strategy = 0;
pascal@23070 62 pd->ff_vcontext.b_sensitivity = 40;
pascal@23070 63 pd->ff_vcontext.brd_scale = 0;
pascal@23070 64 pd->ff_vcontext.bidir_refine = 0;
pascal@23070 65 - pd->ff_vcontext.rc_strategy = 2;
pascal@23070 66 + pd->confdata.rc_strategy = 2;
pascal@23070 67 pd->ff_vcontext.b_quant_factor = 1.25;
pascal@23070 68 pd->ff_vcontext.i_quant_factor = 0.8;
pascal@23070 69 pd->ff_vcontext.b_quant_offset = 1.25;
pascal@23070 70 @@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
pascal@23070 71 pd->ff_vcontext.qblur = 0.5;
pascal@23070 72 pd->ff_vcontext.qcompress = 0.5;
pascal@23070 73 pd->ff_vcontext.mpeg_quant = 0;
pascal@23070 74 - pd->ff_vcontext.rc_initial_cplx = 0.0;
pascal@23070 75 - pd->ff_vcontext.rc_qsquish = 1.0;
pascal@23070 76 + pd->confdata.rc_initial_cplx = 0.0;
pascal@23070 77 + pd->confdata.rc_qsquish = 1.0;
pascal@23070 78 pd->confdata.luma_elim_threshold = 0;
pascal@23070 79 pd->confdata.chroma_elim_threshold = 0;
pascal@23070 80 pd->ff_vcontext.strict_std_compliance = 0;
pascal@23070 81 @@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
pascal@23070 82 pd->ff_vcontext.temporal_cplx_masking = 0.0;
pascal@23070 83 pd->ff_vcontext.spatial_cplx_masking = 0.0;
pascal@23070 84 pd->ff_vcontext.p_masking = 0.0;
pascal@23070 85 - pd->ff_vcontext.border_masking = 0.0;
pascal@23070 86 + pd->confdata.border_masking = 0.0;
pascal@23070 87 pd->ff_vcontext.me_pre_cmp = 0;
pascal@23070 88 pd->ff_vcontext.me_cmp = 0;
pascal@23070 89 pd->ff_vcontext.me_sub_cmp = 0;
pascal@23070 90 @@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
pascal@23070 91 pd->ff_vcontext.pre_me = 1;
pascal@23070 92 pd->ff_vcontext.me_subpel_quality = 8;
pascal@23070 93 pd->ff_vcontext.refs = 1;
pascal@23070 94 - pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
pascal@23070 95 - pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
pascal@23070 96 pd->ff_vcontext.noise_reduction = 0;
pascal@23070 97 pd->confdata.quantizer_noise_shaping = 0;
pascal@23070 98 pd->ff_vcontext.flags = 0;
pascal@23070 99 @@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa
pascal@23070 100 */
pascal@23070 101 static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
pascal@23070 102 {
pascal@23070 103 + char buf[1024];
pascal@23070 104 /* some translation... */
pascal@23070 105 pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
pascal@23070 106 pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
pascal@23070 107 pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
pascal@23070 108 pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
pascal@23070 109 - pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
pascal@23070 110 - pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
pascal@23070 111 - pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
pascal@23070 112 + snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
pascal@23070 113 + av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
pascal@23070 114 + snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
pascal@23070 115 + av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
pascal@23070 116
pascal@23070 117 pd->ff_vcontext.flags = 0;
pascal@23070 118 - SET_FLAG(pd, mv0);
pascal@23070 119 SET_FLAG(pd, qpel);
pascal@23070 120 - SET_FLAG(pd, naq);
pascal@23070 121 SET_FLAG(pd, ilme);
pascal@23070 122 SET_FLAG(pd, ildct);
pascal@23070 123 SET_FLAG(pd, aic);
pascal@23070 124 @@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
pascal@23070 125 }
pascal@23070 126 if (pd->interlacing.active) {
pascal@23070 127 /* enforce interlacing */
pascal@23070 128 - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
pascal@23070 129 - pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
pascal@23070 130 + pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
pascal@23070 131 + pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
pascal@23070 132 }
pascal@23070 133 if (pd->confdata.flags.alt) {
pascal@23070 134 av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
pascal@23070 135 @@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
pascal@23070 136 if (pd->confdata.flags.cbp) {
pascal@23070 137 av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
pascal@23070 138 }
pascal@23070 139 + if (pd->confdata.flags.mv0) {
pascal@23070 140 + av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
pascal@23070 141 + }
pascal@23070 142 + if (pd->confdata.flags.naq) {
pascal@23070 143 + av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
pascal@23070 144 + }
pascal@23070 145
pascal@23070 146 - char buf[1024];
pascal@23070 147 #define set_dict_opt(val, opt) \
pascal@23070 148 snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
pascal@23070 149 av_dict_set(&(pd->ff_opts), opt, buf, 0)
pascal@23070 150 +#define set_dict_float_opt(val, opt) \
pascal@23070 151 + snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
pascal@23070 152 + av_dict_set(&(pd->ff_opts), opt, buf, 0)
pascal@23070 153
pascal@23070 154 set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
pascal@23070 155 set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
pascal@23070 156 set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
pascal@23070 157 + set_dict_opt(inter_quant_bias, "pbias");
pascal@23070 158 + set_dict_opt(intra_quant_bias, "ibias");
pascal@23070 159 + set_dict_opt(me_method, "me_method");
pascal@23070 160 + set_dict_opt(scenechange_factor, "sc_factor");
pascal@23070 161 + set_dict_opt(rc_strategy, "rc_strategy");
pascal@23070 162 + set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
pascal@23070 163 + set_dict_float_opt(rc_qsquish, "qsquish");
pascal@23070 164 + set_dict_float_opt(border_masking, "border_mask");
pascal@23070 165 }
pascal@23070 166
pascal@23070 167 #undef SET_FLAG
pascal@23070 168 @@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
pascal@23070 169 { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
pascal@23070 170 { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
pascal@23070 171 { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
pascal@23070 172 - { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
pascal@23070 173 + { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
pascal@23070 174 { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
pascal@23070 175 { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
pascal@23070 176 { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
pascal@23070 177 { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
pascal@23070 178 - { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
pascal@23070 179 + { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
pascal@23070 180 { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
pascal@23070 181 { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
pascal@23070 182 { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
pascal@23070 183 @@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
pascal@23070 184 { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
pascal@23070 185 { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
pascal@23070 186 { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
pascal@23070 187 - { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
pascal@23070 188 + { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
pascal@23070 189 { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
pascal@23070 190 { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
pascal@23070 191 { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
pascal@23070 192 @@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri
pascal@23070 193 { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 194 // { "vrc_eq", }, // not yet supported
pascal@23070 195 { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
pascal@23070 196 - { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
pascal@23070 197 + { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
pascal@23070 198 // { "vrc_init_occupancy", }, // not yet supported
pascal@23070 199 - { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
pascal@23070 200 + { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
pascal@23070 201 { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
pascal@23070 202 { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
pascal@23070 203 { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
pascal@23070 204 @@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
pascal@23070 205 { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
pascal@23070 206 { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
pascal@23070 207 { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
pascal@23070 208 - { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
pascal@23070 209 + { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
pascal@23070 210 { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
pascal@23070 211 { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
pascal@23070 212 { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
pascal@23070 213 @@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
pascal@23070 214 { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
pascal@23070 215 { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
pascal@23070 216 { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
pascal@23070 217 - { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
pascal@23070 218 - { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
pascal@23070 219 + { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
pascal@23070 220 + { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
pascal@23070 221 { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
pascal@23070 222 { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
pascal@23070 223 { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
pascal@23070 224 { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
pascal@23070 225
pascal@23070 226 - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
pascal@23070 227 + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 228 { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 229 - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
pascal@23070 230 + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
pascal@23070 231 { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 232 - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
pascal@23070 233 - { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
pascal@23070 234 - { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
pascal@23070 235 + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
pascal@23070 236 + { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
pascal@23070 237 + { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 238 { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 239 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
pascal@23070 240 { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
pascal@23070 241 #else
pascal@23070 242 - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
pascal@23070 243 + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
pascal@23070 244 #endif
pascal@23070 245 { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 246 { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 247 - { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
pascal@23070 248 + { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
pascal@23070 249 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
pascal@23070 250 { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
pascal@23070 251 #else
pascal@23070 252 { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
pascal@23070 253 #endif
pascal@23070 254 - { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
pascal@23070 255 - { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
pascal@23070 256 - { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
pascal@23070 257 + { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
pascal@23070 258 + { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
pascal@23070 259 + { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
pascal@23070 260
pascal@23070 261 // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported
pascal@23070 262 /* End of the config file */
pascal@23070 263 Index: transcode-1.1.7/export/export_ffmpeg.c
pascal@23070 264 ===================================================================
pascal@23070 265 --- transcode-1.1.7.orig/export/export_ffmpeg.c
pascal@23070 266 +++ transcode-1.1.7/export/export_ffmpeg.c
pascal@23070 267 @@ -828,14 +828,11 @@ MOD_init
pascal@23070 268
pascal@23070 269 lavc_venc_context->bit_rate = vob->divxbitrate * 1000;
pascal@23070 270 lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
pascal@23070 271 - lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
pascal@23070 272 - lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
pascal@23070 273 lavc_venc_context->max_qdiff = lavc_param_vqdiff;
pascal@23070 274 lavc_venc_context->qcompress = lavc_param_vqcompress;
pascal@23070 275 lavc_venc_context->qblur = lavc_param_vqblur;
pascal@23070 276 lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames;
pascal@23070 277 lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor;
pascal@23070 278 - lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
pascal@23070 279 lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
pascal@23070 280 lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
pascal@23070 281
pascal@23070 282 @@ -843,8 +840,23 @@ MOD_init
pascal@23070 283 #define set_dict_opt(val, opt) \
pascal@23070 284 snprintf(buf, sizeof(buf), "%i", val); \
pascal@23070 285 av_dict_set(&lavc_venc_opts, opt, buf, 0)
pascal@23070 286 +#define set_dict_float_opt(val, opt) \
pascal@23070 287 + snprintf(buf, sizeof(buf), "%f", val); \
pascal@23070 288 + av_dict_set(&lavc_venc_opts, opt, buf, 0)
pascal@23070 289 set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
pascal@23070 290 set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
pascal@23070 291 + set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
pascal@23070 292 + set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
pascal@23070 293 + set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
pascal@23070 294 + set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
pascal@23070 295 + set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
pascal@23070 296 + set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
pascal@23070 297 + set_dict_opt(lavc_param_rc_eq, "rc_eq");
pascal@23070 298 + set_dict_opt(lavc_param_vme, "me_method");
pascal@23070 299 + set_dict_opt(lavc_param_ibias, "ibias");
pascal@23070 300 + set_dict_opt(lavc_param_pbias, "pbias");
pascal@23070 301 + set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
pascal@23070 302 + set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
pascal@23070 303 lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
pascal@23070 304 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
pascal@23070 305 if (lavc_param_packet_size)
pascal@23070 306 @@ -853,15 +865,9 @@ MOD_init
pascal@23070 307 lavc_venc_context->strict_std_compliance= lavc_param_strict;
pascal@23070 308 lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor;
pascal@23070 309 lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset;
pascal@23070 310 - lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish;
pascal@23070 311 - lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp;
pascal@23070 312 - lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq;
pascal@23070 313 - lavc_venc_context->rc_eq = lavc_param_rc_eq;
pascal@23070 314 lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000;
pascal@23070 315 lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000;
pascal@23070 316 lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024;
pascal@23070 317 - lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
pascal@23070 318 - lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx;
pascal@23070 319 lavc_venc_context->debug = lavc_param_debug;
pascal@23070 320 lavc_venc_context->last_predictor_count= lavc_param_last_pred;
pascal@23070 321 lavc_venc_context->pre_me = lavc_param_pre_me;
pascal@23070 322 @@ -869,8 +875,6 @@ MOD_init
pascal@23070 323 lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size;
pascal@23070 324 lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality;
pascal@23070 325 lavc_venc_context->me_range = lavc_param_me_range;
pascal@23070 326 - lavc_venc_context->intra_quant_bias = lavc_param_ibias;
pascal@23070 327 - lavc_venc_context->inter_quant_bias = lavc_param_pbias;
pascal@23070 328 lavc_venc_context->coder_type = lavc_param_coder;
pascal@23070 329 lavc_venc_context->context_model = lavc_param_context;
pascal@23070 330 lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
pascal@23070 331 @@ -1076,6 +1080,8 @@ MOD_init
pascal@23070 332 lavc_venc_context->flags |= lavc_param_mv0;
pascal@23070 333 if(lavc_param_qp_rd)
pascal@23070 334 av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
pascal@23070 335 + if (lavc_param_normalize_aqp)
pascal@23070 336 + av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
pascal@23070 337 lavc_venc_context->flags |= lavc_param_ilme;
pascal@23070 338 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
pascal@23070 339 lavc_venc_context->flags |= lavc_param_trell;
pascal@23070 340 @@ -1084,9 +1090,7 @@ MOD_init
pascal@23070 341 #endif
pascal@23070 342
pascal@23070 343 if (lavc_param_gray)
pascal@23070 344 - lavc_venc_context->flags |= CODEC_FLAG_GRAY;
pascal@23070 345 - if (lavc_param_normalize_aqp)
pascal@23070 346 - lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
pascal@23070 347 + lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
pascal@23070 348
pascal@23070 349 switch(vob->encode_fields) {
pascal@23070 350 case TC_ENCODE_FIELDS_TOP_FIRST:
pascal@23070 351 @@ -1104,9 +1108,9 @@ MOD_init
pascal@23070 352 }
pascal@23070 353
pascal@23070 354 lavc_venc_context->flags |= interlacing_active ?
pascal@23070 355 - CODEC_FLAG_INTERLACED_DCT : 0;
pascal@23070 356 + AV_CODEC_FLAG_INTERLACED_DCT : 0;
pascal@23070 357 lavc_venc_context->flags |= interlacing_active ?
pascal@23070 358 - CODEC_FLAG_INTERLACED_ME : 0;
pascal@23070 359 + AV_CODEC_FLAG_INTERLACED_ME : 0;
pascal@23070 360
pascal@23070 361 lavc_venc_context->flags |= lavc_param_psnr;
pascal@23070 362 do_psnr = lavc_param_psnr;
pascal@23070 363 @@ -1153,7 +1157,7 @@ MOD_init
pascal@23070 364 "encoding.");
pascal@23070 365 return TC_EXPORT_ERROR;
pascal@23070 366 }
pascal@23070 367 - lavc_venc_context->flags |= CODEC_FLAG_PASS1;
pascal@23070 368 + lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
pascal@23070 369 stats_file = fopen(vob->divxlogfile, "w");
pascal@23070 370 if (stats_file == NULL){
pascal@23070 371 tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
pascal@23070 372 @@ -1167,7 +1175,7 @@ MOD_init
pascal@23070 373 "encoding.");
pascal@23070 374 return TC_EXPORT_ERROR;
pascal@23070 375 }
pascal@23070 376 - lavc_venc_context->flags |= CODEC_FLAG_PASS2;
pascal@23070 377 + lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
pascal@23070 378 stats_file= fopen(vob->divxlogfile, "r");
pascal@23070 379 if (stats_file==NULL){
pascal@23070 380 tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
pascal@23070 381 @@ -1198,12 +1203,11 @@ MOD_init
pascal@23070 382 break;
pascal@23070 383 case 3:
pascal@23070 384 /* fixed qscale :p */
pascal@23070 385 - lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
pascal@23070 386 + lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
pascal@23070 387 lavc_venc_frame->quality = vob->divxbitrate;
pascal@23070 388 break;
pascal@23070 389 }
pascal@23070 390
pascal@23070 391 - lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
pascal@23070 392
pascal@23070 393 /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
pascal@23070 394 if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
pascal@23070 395 Index: transcode-1.1.7/export/ffmpeg_cfg.c
pascal@23070 396 ===================================================================
pascal@23070 397 --- transcode-1.1.7.orig/export/ffmpeg_cfg.c
pascal@23070 398 +++ transcode-1.1.7/export/ffmpeg_cfg.c
pascal@23070 399 @@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
pascal@23070 400 int lavc_param_pre_me= 1;
pascal@23070 401 int lavc_param_me_subpel_quality= 8;
pascal@23070 402 int lavc_param_me_range=0;
pascal@23070 403 -int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
pascal@23070 404 -int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
pascal@23070 405 +int lavc_param_ibias=0;
pascal@23070 406 +int lavc_param_pbias=0;
pascal@23070 407 int lavc_param_coder=0;
pascal@23070 408 int lavc_param_context=0;
pascal@23070 409 char *lavc_param_intra_matrix = NULL;
pascal@23070 410 @@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
pascal@23070 411 {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
pascal@23070 412 {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 413 {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
pascal@23070 414 - {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
pascal@23070 415 + {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
pascal@23070 416 {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
pascal@23070 417 // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
pascal@23070 418 // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
pascal@23070 419 @@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
pascal@23070 420 {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
pascal@23070 421 {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
pascal@23070 422 {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
pascal@23070 423 - {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
pascal@23070 424 + {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX},
pascal@23070 425 // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
pascal@23070 426 {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
pascal@23070 427 {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
pascal@23070 428 @@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
pascal@23070 429 {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
pascal@23070 430 {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 431 // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
pascal@23070 432 - {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
pascal@23070 433 + {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
pascal@23070 434 {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 435 {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
pascal@23070 436 {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
pascal@23070 437 @@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
pascal@23070 438 {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
pascal@23070 439 {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
pascal@23070 440 {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
pascal@23070 441 - {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
pascal@23070 442 + {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
pascal@23070 443 {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
pascal@23070 444 {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
pascal@23070 445 {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
pascal@23070 446 @@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
pascal@23070 447 {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
pascal@23070 448 {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
pascal@23070 449 {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
pascal@23070 450 - {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
pascal@23070 451 + {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
pascal@23070 452 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
pascal@23070 453 - {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
pascal@23070 454 + {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
pascal@23070 455 #else
pascal@23070 456 {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 457 #endif
pascal@23070 458 @@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
pascal@23070 459 {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
pascal@23070 460 {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
pascal@23070 461 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
pascal@23070 462 - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
pascal@23070 463 + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
pascal@23070 464 #else
pascal@23070 465 - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
pascal@23070 466 + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
pascal@23070 467 #endif
pascal@23070 468 {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 469 {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
pascal@23070 470 @@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
pascal@23070 471 {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
pascal@23070 472 {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
pascal@23070 473 {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 474 - {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
pascal@23070 475 + {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 476 {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
pascal@23070 477 {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 478 {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
pascal@23070 479 {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 480 {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 481 {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 482 - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
pascal@23070 483 + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME},
pascal@23070 484 {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
pascal@23070 485 {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
pascal@23070 486 {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
pascal@23070 487 - {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
pascal@23070 488 - {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
pascal@23070 489 - {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
pascal@23070 490 + {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
pascal@23070 491 + {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
pascal@23070 492 + {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
pascal@23070 493 {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
pascal@23070 494 {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
pascal@23070 495 {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
pascal@23070 496 Index: transcode-1.1.7/import/import_ffmpeg.c
pascal@23070 497 ===================================================================
pascal@23070 498 --- transcode-1.1.7.orig/import/import_ffmpeg.c
pascal@23070 499 +++ transcode-1.1.7/import/import_ffmpeg.c
pascal@23070 500 @@ -310,7 +310,7 @@ do_avi:
pascal@23070 501 lavc_dec_context->width = x_dim;
pascal@23070 502 lavc_dec_context->height = y_dim;
pascal@23070 503
pascal@23070 504 - if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
pascal@23070 505 + if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
pascal@23070 506 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
pascal@23070 507 lavc_dec_context->error_resilience = 2;
pascal@23070 508 #else