summaryrefslogtreecommitdiff
path: root/media-video/transcode
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /media-video/transcode
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'media-video/transcode')
-rw-r--r--media-video/transcode/Manifest7
-rw-r--r--media-video/transcode/files/ffmpeg4.patch508
-rw-r--r--media-video/transcode/files/transcode-1.1.7-glibc-2.32.patch58
-rw-r--r--media-video/transcode/transcode-1.1.7-r4.ebuild5
-rw-r--r--media-video/transcode/transcode-1.1.7-r5.ebuild8
5 files changed, 70 insertions, 516 deletions
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index c409f37a21d6..ddfb11756305 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,8 +1,9 @@
-AUX ffmpeg4.patch 28911 BLAKE2B f1189589a39ea9801e1620bd138499f5f5a29429cc7372ebf65b38901f1f4f0b71957a216a65367108660709ea5ca001e5ce68d67dfd478ed471963acef087a3 SHA512 1550b2de1ca0265703513d3b7fca3441f6216d89792dc68e224f5f2d99386275cdfdf7ef7b01abaf69f5de5d9af1f221617697aff6345d3d1b2e5a06d30e1f6d
AUX transcode-1.1.7-gcc10-fno-common.patch 860 BLAKE2B c564b28e99ef397694243e9411e10feec4fe9c1b5efb8f6ea4c76621a61116a6c0d643a3c21a9544960763e9ff68221e747be1b66598f31bf638edaf585131cd SHA512 edfc821ec0beb4c0edd9fc7a6f2f5f49417190a03c7c79b62b386e34a4746c327fcf7bfe8d0ee339cc374a6333b55bf1399d7cc9c300620c348f22b658247861
+AUX transcode-1.1.7-glibc-2.32.patch 2460 BLAKE2B cbdb361715ead7231dba6f4b1a50201452e9f258a1434cd823dc12f3cb046677d141041ca2ac006e3889c81810ec0e74ce6cadb1ac7309fa7b245331b128cbf1 SHA512 351f826ae2742ebb85f831f8031c55fca3571da52ba46989ec8e400b9c7d7416fe6619cf1ab15659ddab27d6b2d6d04fd8fd25863526655d02078af113716a11
AUX transcode-1.1.7-swresample.patch 674 BLAKE2B 733a3490d2a25b20555cce3624f8e1753d22e3ae945a9656b835a5bf0eabf1b2f16fc1df1f817931dfc618b644c9e359c1c37939ef169f3f59006455a4fa2c75 SHA512 a9a79215082506882f1d1549cbe51706670f7ccf9d5da1400f9bf81482d4f410a855772183eeac8d9fa865d5d6086e10cbe8f4d7176802959a0a8b5df0759abb
+DIST transcode-1.1.7-ffmpeg4.patch.xz 4880 BLAKE2B 92bf63ba3f9cb69aff3cdc0f7250da0452f8bc0977010d024bbd8bbf9f66b86fb31e819ec3d1069e9176fdb58cba6ec510b866ddc44a65fd252f175cc567807a SHA512 8c44fd1b78dbbafbbef090d6115bbe086605f1d5b5286eba83d9c7c0d5457af286cb5d61ab6d260380694b6b3636f751709476915dcab5cc3109dc868785f424
DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
-EBUILD transcode-1.1.7-r4.ebuild 4131 BLAKE2B ebcdf29ad43555dc557fc9f05c8830efa680cf8f50286850b3d0d8b36ae0c931293f2e7ac69f95b471b2ef458470ab75a465757323ae6fe05d3f329846c41733 SHA512 1134536dcfcbbc4418bd8b9a4a7fac6aa2e87f7c4aa1c2897a373fa46a5e0f48692859b67dcf696634a36dbb89e3fa89821e6cec54d778a4156112a8f2939f18
-EBUILD transcode-1.1.7-r5.ebuild 4232 BLAKE2B ad831e1ea1fd05fa2d3c4e0a02847cb6661ce2dac17ce313f12fdb869b9c0b86ab2e9aed281b041ec2a42acabb2a00d2cdbfa9b953361b86f53eeee3a9e9ed4e SHA512 5f823ca59191cb040e1f75cc60d6becff6e88621f65fc3dc537a8942c9c488a10a728bca95727215607d8bdffb36fae4134fcb75a3f31b3a1fe63240cd554d44
+EBUILD transcode-1.1.7-r4.ebuild 4218 BLAKE2B e47bb128f52607c24b192daf755c625b0807b48adaffb466550ee6eeee3a1a968c3574a25428f8c642783a07ba497efb6a9810505f8ccb2bcf1a187dda8ab9ab SHA512 0678815f7229f521210419fd57f0204a3066a2c436cc7847631722fbbd60dc12be6716664d9a65e04567dee7c78f19ac9484d678aa9a73f9b88c63af9b1c5288
+EBUILD transcode-1.1.7-r5.ebuild 4351 BLAKE2B d123cd546237ece93c5b25c8c76615b7822ed35e0edd76bc7e5b0b05aa8c4316714657db23def65f62310068ea62cf034769ed1974ae47851943562db7733228 SHA512 8c66ea579849464e6eaca36f62d055cf5913f851178fa9a00950c1db8d9508fc079db0506817f2a2f7741d31a6201658aa108ac7226c2b053e2b0aa995aa13f6
MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/files/ffmpeg4.patch b/media-video/transcode/files/ffmpeg4.patch
deleted file mode 100644
index 9ad765e1c37d..000000000000
--- a/media-video/transcode/files/ffmpeg4.patch
+++ /dev/null
@@ -1,508 +0,0 @@
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
- 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 {
-@@ -684,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"
-@@ -694,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\""
-@@ -723,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;
- }
-@@ -970,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;
-@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
- pd->ff_vcontext.me_range = 0;
- 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;
-@@ -996,8 +1003,8 @@ 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_qsquish = 1.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;
-@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
- pd->ff_vcontext.temporal_cplx_masking = 0.0;
- 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;
-@@ -1020,8 +1027,6 @@ 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->confdata.quantizer_noise_shaping = 0;
- pd->ff_vcontext.flags = 0;
-@@ -1044,19 +1049,19 @@ 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, qpel);
-- SET_FLAG(pd, naq);
- SET_FLAG(pd, ilme);
- SET_FLAG(pd, ildct);
- SET_FLAG(pd, aic);
-@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
- }
- 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);
-@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
- 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
-@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
- { "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 },
-- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
-+ { "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 },
-@@ -1175,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 },
-@@ -1185,9 +1206,9 @@ 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", 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 },
-@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
- { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
- { "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 },
-@@ -1212,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", 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, 1 },
- { "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, AV_CODEC_FLAG_QPEL },
- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
-- { "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 },
-- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
-+ { "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, AV_CODEC_FLAG_AC_PRED },
- #endif
- { "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 },
- #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 */
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -831,14 +831,11 @@ MOD_init
-
- 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;
-
-@@ -846,8 +843,23 @@ MOD_init
- #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)
-@@ -856,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;
-@@ -872,8 +878,6 @@ 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;
-@@ -1079,6 +1083,8 @@ MOD_init
- lavc_venc_context->flags |= lavc_param_mv0;
- 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;
-@@ -1087,9 +1093,7 @@ MOD_init
- #endif
-
- 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:
-@@ -1107,9 +1111,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;
-@@ -1156,7 +1160,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\".",
-@@ -1170,7 +1174,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 "
-@@ -1201,12 +1205,11 @@ 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 && strcmp(lavc_param_video_preset, "none")) {
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -93,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;
-@@ -136,7 +136,7 @@ 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},
-@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
- {"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},
-@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
- {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
- {"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_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},
-@@ -184,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},
-@@ -192,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
- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
- #endif
-@@ -203,9 +203,9 @@ 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, 1},
- {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
- {"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, 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, 1},
- {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
- {"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},
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -361,7 +361,7 @@ 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
diff --git a/media-video/transcode/files/transcode-1.1.7-glibc-2.32.patch b/media-video/transcode/files/transcode-1.1.7-glibc-2.32.patch
new file mode 100644
index 000000000000..12ef638d0263
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-glibc-2.32.patch
@@ -0,0 +1,58 @@
+--- a/import/v4l/import_v4l2.c 2020-08-28 08:28:44.311434934 +0000
++++ b/import/v4l/import_v4l2.c 2020-08-28 08:41:19.279323984 +0000
+@@ -455,7 +455,7 @@
+ tc_log_warn(MOD_NAME,
+ "driver does not support cropping"
+ "(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled",
+- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++ strerror(errno));
+ return TC_ERROR;
+ }
+ if (verbose_flag > TC_INFO) {
+@@ -485,7 +485,7 @@
+ tc_log_warn(MOD_NAME,
+ "driver does not support inquiring cropping"
+ " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
+- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++ strerror(errno));
+ return -1;
+ }
+
+@@ -513,7 +513,7 @@
+ tc_log_warn(MOD_NAME,
+ "driver does not support inquering cropping"
+ " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
+- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++ strerror(errno));
+ return -1;
+ }
+ if (verbose_flag > TC_INFO) {
+@@ -613,7 +613,7 @@
+ if (err < 0) {
+ if (verbose_flag) {
+ tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%s\")",
+- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++ strerror(errno));
+ }
+ }
+ return TC_OK;
+@@ -628,7 +628,7 @@
+ err = ioctl(vs->video_fd, VIDIOC_G_STD, &stdid);
+ if (err < 0) {
+ tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%s\")",
+- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++ strerror(errno));
+ memset(&stdid, 0, sizeof(v4l2_std_id));
+ }
+
+--- a/import/v4l/import_v4lcam.c 2020-10-02 13:28:47.215179051 +0700
++++ b/import/v4l/import_v4lcam.c 2020-10-02 13:28:40.132224906 +0700
+@@ -368,7 +368,7 @@ static int tc_v4l2_video_setup_stream_pa
+ if (err < 0) {
+ tc_log_warn(MOD_NAME, "driver does not support setting parameters"
+ " (ioctl(VIDIOC_S_PARM) returns \"%s\")",
+- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++ strerror(errno));
+ }
+ return TC_OK;
+ }
diff --git a/media-video/transcode/transcode-1.1.7-r4.ebuild b/media-video/transcode/transcode-1.1.7-r4.ebuild
index 1091cd557b80..2eabda9fb10d 100644
--- a/media-video/transcode/transcode-1.1.7-r4.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r4.ebuild
@@ -7,7 +7,8 @@ inherit autotools libtool multilib
DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
- https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
+ https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-1.1.7-ffmpeg4.patch.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -78,7 +79,7 @@ src_prepare() {
fi
if has_version '>=media-video/ffmpeg-4' ; then
- PATCHES+=( "${FILESDIR}/ffmpeg4.patch" )
+ PATCHES+=( "${WORKDIR}/transcode-1.1.7-ffmpeg4.patch" )
fi
default
diff --git a/media-video/transcode/transcode-1.1.7-r5.ebuild b/media-video/transcode/transcode-1.1.7-r5.ebuild
index 6af3a27f9474..2a8fe279f70e 100644
--- a/media-video/transcode/transcode-1.1.7-r5.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r5.ebuild
@@ -7,11 +7,12 @@ inherit autotools libtool multilib
DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
- https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
+ https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-1.1.7-ffmpeg4.patch.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 sparc x86"
IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
RDEPEND="
@@ -68,6 +69,7 @@ PATCHES=(
"${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
"${FILESDIR}"/${P}-swresample.patch #722296
"${FILESDIR}"/${P}-gcc10-fno-common.patch
+ "${FILESDIR}"/${P}-glibc-2.32.patch
)
src_prepare() {
@@ -80,7 +82,7 @@ src_prepare() {
fi
if has_version '>=media-video/ffmpeg-4' ; then
- PATCHES+=( "${FILESDIR}/ffmpeg4.patch" )
+ PATCHES+=( "${WORKDIR}/transcode-1.1.7-ffmpeg4.patch" )
fi
default