Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/transcode/files/, media-video/transcode/
Date: Sat, 31 Oct 2020 16:41:59
Message-Id: 1604162462.fdc393c26d78752eab23d31e2eed9e7697f529a0.whissi@gentoo
1 commit: fdc393c26d78752eab23d31e2eed9e7697f529a0
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 31 16:41:02 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 31 16:41:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc393c2
7
8 media-video/transcode: fix SizeViolation
9
10 Closes: https://bugs.gentoo.org/748201
11 Package-Manager: Portage-3.0.8, Repoman-3.0.2
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 media-video/transcode/Manifest | 1 +
15 media-video/transcode/files/ffmpeg4.patch | 508 ------------------------
16 media-video/transcode/transcode-1.1.7-r4.ebuild | 5 +-
17 media-video/transcode/transcode-1.1.7-r5.ebuild | 5 +-
18 4 files changed, 7 insertions(+), 512 deletions(-)
19
20 diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
21 index 557759b9b33..8cf471df29b 100644
22 --- a/media-video/transcode/Manifest
23 +++ b/media-video/transcode/Manifest
24 @@ -1,2 +1,3 @@
25 +DIST transcode-1.1.7-ffmpeg4.patch.xz 4880 BLAKE2B 92bf63ba3f9cb69aff3cdc0f7250da0452f8bc0977010d024bbd8bbf9f66b86fb31e819ec3d1069e9176fdb58cba6ec510b866ddc44a65fd252f175cc567807a SHA512 8c44fd1b78dbbafbbef090d6115bbe086605f1d5b5286eba83d9c7c0d5457af286cb5d61ab6d260380694b6b3636f751709476915dcab5cc3109dc868785f424
26 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
27 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
28
29 diff --git a/media-video/transcode/files/ffmpeg4.patch b/media-video/transcode/files/ffmpeg4.patch
30 deleted file mode 100644
31 index 9ad765e1c37..00000000000
32 --- a/media-video/transcode/files/ffmpeg4.patch
33 +++ /dev/null
34 @@ -1,508 +0,0 @@
35 -Index: transcode-1.1.7/encode/encode_lavc.c
36 -===================================================================
37 ---- transcode-1.1.7.orig/encode/encode_lavc.c
38 -+++ transcode-1.1.7/encode/encode_lavc.c
39 -@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
40 - int luma_elim_threshold;
41 - int chroma_elim_threshold;
42 - int quantizer_noise_shaping;
43 -+ int inter_quant_bias;
44 -+ int intra_quant_bias;
45 -+ int scenechange_factor;
46 -+ int rc_strategy;
47 -+ float rc_initial_cplx;
48 -+ float rc_qsquish;
49 -+ float border_masking;
50 -
51 - /* same as above for flags */
52 - struct {
53 -@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
54 - switch (vob->divxmultipass) {
55 - case 1:
56 - CAN_DO_MULTIPASS(multipass_flag);
57 -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
58 -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
59 - pd->stats_file = fopen(vob->divxlogfile, "w");
60 - if (pd->stats_file == NULL) {
61 - tc_log_error(MOD_NAME, "could not create 2pass log file"
62 -@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
63 - break;
64 - case 2:
65 - CAN_DO_MULTIPASS(multipass_flag);
66 -- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
67 -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
68 - pd->stats_file = fopen(vob->divxlogfile, "r");
69 - if (pd->stats_file == NULL){
70 - tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
71 -@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
72 - break;
73 - case 3:
74 - /* fixed qscale :p */
75 -- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
76 -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
77 - pd->ff_venc_frame.quality = vob->divxbitrate;
78 - break;
79 - }
80 -@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
81 - pd->confdata.rc_buffer_size = 0;
82 - pd->confdata.lmin = 2;
83 - pd->confdata.lmax = 31;
84 -- pd->confdata.me_method = ME_EPZS;
85 -+ pd->confdata.me_method = 0;
86 -
87 - memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
88 - pd->confdata.turbo_setup = 0;
89 -@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
90 - pd->ff_vcontext.me_range = 0;
91 - pd->ff_vcontext.mb_decision = 0;
92 - pd->ff_vcontext.scenechange_threshold = 0;
93 -- pd->ff_vcontext.scenechange_factor = 1;
94 -+ pd->confdata.scenechange_factor = 1;
95 - pd->ff_vcontext.b_frame_strategy = 0;
96 - pd->ff_vcontext.b_sensitivity = 40;
97 - pd->ff_vcontext.brd_scale = 0;
98 - pd->ff_vcontext.bidir_refine = 0;
99 -- pd->ff_vcontext.rc_strategy = 2;
100 -+ pd->confdata.rc_strategy = 2;
101 - pd->ff_vcontext.b_quant_factor = 1.25;
102 - pd->ff_vcontext.i_quant_factor = 0.8;
103 - pd->ff_vcontext.b_quant_offset = 1.25;
104 -@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
105 - pd->ff_vcontext.qblur = 0.5;
106 - pd->ff_vcontext.qcompress = 0.5;
107 - pd->ff_vcontext.mpeg_quant = 0;
108 -- pd->ff_vcontext.rc_initial_cplx = 0.0;
109 -- pd->ff_vcontext.rc_qsquish = 1.0;
110 -+ pd->confdata.rc_initial_cplx = 0.0;
111 -+ pd->confdata.rc_qsquish = 1.0;
112 - pd->confdata.luma_elim_threshold = 0;
113 - pd->confdata.chroma_elim_threshold = 0;
114 - pd->ff_vcontext.strict_std_compliance = 0;
115 -@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
116 - pd->ff_vcontext.temporal_cplx_masking = 0.0;
117 - pd->ff_vcontext.spatial_cplx_masking = 0.0;
118 - pd->ff_vcontext.p_masking = 0.0;
119 -- pd->ff_vcontext.border_masking = 0.0;
120 -+ pd->confdata.border_masking = 0.0;
121 - pd->ff_vcontext.me_pre_cmp = 0;
122 - pd->ff_vcontext.me_cmp = 0;
123 - pd->ff_vcontext.me_sub_cmp = 0;
124 -@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
125 - pd->ff_vcontext.pre_me = 1;
126 - pd->ff_vcontext.me_subpel_quality = 8;
127 - pd->ff_vcontext.refs = 1;
128 -- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
129 -- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
130 - pd->ff_vcontext.noise_reduction = 0;
131 - pd->confdata.quantizer_noise_shaping = 0;
132 - pd->ff_vcontext.flags = 0;
133 -@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa
134 - */
135 - static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
136 - {
137 -+ char buf[1024];
138 - /* some translation... */
139 - pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
140 - pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
141 - pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
142 - pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
143 -- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
144 -- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
145 -- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
146 -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
147 -+ av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
148 -+ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
149 -+ av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
150 -
151 - pd->ff_vcontext.flags = 0;
152 -- SET_FLAG(pd, mv0);
153 - SET_FLAG(pd, qpel);
154 -- SET_FLAG(pd, naq);
155 - SET_FLAG(pd, ilme);
156 - SET_FLAG(pd, ildct);
157 - SET_FLAG(pd, aic);
158 -@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
159 - }
160 - if (pd->interlacing.active) {
161 - /* enforce interlacing */
162 -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
163 -- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
164 -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
165 -+ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
166 - }
167 - if (pd->confdata.flags.alt) {
168 - av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
169 -@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
170 - if (pd->confdata.flags.cbp) {
171 - av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
172 - }
173 -+ if (pd->confdata.flags.mv0) {
174 -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
175 -+ }
176 -+ if (pd->confdata.flags.naq) {
177 -+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
178 -+ }
179 -
180 -- char buf[1024];
181 - #define set_dict_opt(val, opt) \
182 - snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
183 - av_dict_set(&(pd->ff_opts), opt, buf, 0)
184 -+#define set_dict_float_opt(val, opt) \
185 -+ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
186 -+ av_dict_set(&(pd->ff_opts), opt, buf, 0)
187 -
188 - set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
189 - set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
190 - set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
191 -+ set_dict_opt(inter_quant_bias, "pbias");
192 -+ set_dict_opt(intra_quant_bias, "ibias");
193 -+ set_dict_opt(me_method, "me_method");
194 -+ set_dict_opt(scenechange_factor, "sc_factor");
195 -+ set_dict_opt(rc_strategy, "rc_strategy");
196 -+ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
197 -+ set_dict_float_opt(rc_qsquish, "qsquish");
198 -+ set_dict_float_opt(border_masking, "border_mask");
199 - }
200 -
201 - #undef SET_FLAG
202 -@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
203 - { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
204 - { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
205 - { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
206 -- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
207 -+ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
208 - { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
209 - { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
210 - { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
211 - { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
212 -- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
213 -+ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
214 - { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
215 - { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
216 - { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
217 -@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
218 - { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
219 - { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
220 - { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
221 -- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
222 -+ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
223 - { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
224 - { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
225 - { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
226 -@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri
227 - { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
228 - // { "vrc_eq", }, // not yet supported
229 - { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
230 -- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
231 -+ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
232 - // { "vrc_init_occupancy", }, // not yet supported
233 -- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
234 -+ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
235 - { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
236 - { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
237 - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
238 -@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
239 - { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
240 - { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
241 - { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
242 -- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
243 -+ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
244 - { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
245 - { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
246 - { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
247 -@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
248 - { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
249 - { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
250 - { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
251 -- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
252 -- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
253 -+ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
254 -+ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
255 - { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
256 - { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
257 - { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
258 - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
259 -
260 -- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
261 -+ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
262 - { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
263 -- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
264 -+ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
265 - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
266 -- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
267 -- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
268 -- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
269 -+ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
270 -+ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
271 -+ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
272 - { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
273 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
274 - { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
275 - #else
276 -- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
277 -+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
278 - #endif
279 - { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
280 - { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
281 -- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
282 -+ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
283 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
284 - { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
285 - #else
286 - { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
287 - #endif
288 -- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
289 -- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
290 -- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
291 -+ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
292 -+ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
293 -+ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
294 -
295 - // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported
296 - /* End of the config file */
297 -Index: transcode-1.1.7/export/export_ffmpeg.c
298 -===================================================================
299 ---- transcode-1.1.7.orig/export/export_ffmpeg.c
300 -+++ transcode-1.1.7/export/export_ffmpeg.c
301 -@@ -831,14 +831,11 @@ MOD_init
302 -
303 - lavc_venc_context->bit_rate = vob->divxbitrate * 1000;
304 - lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
305 -- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
306 -- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
307 - lavc_venc_context->max_qdiff = lavc_param_vqdiff;
308 - lavc_venc_context->qcompress = lavc_param_vqcompress;
309 - lavc_venc_context->qblur = lavc_param_vqblur;
310 - lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames;
311 - lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor;
312 -- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
313 - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
314 - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
315 -
316 -@@ -846,8 +843,23 @@ MOD_init
317 - #define set_dict_opt(val, opt) \
318 - snprintf(buf, sizeof(buf), "%i", val); \
319 - av_dict_set(&lavc_venc_opts, opt, buf, 0)
320 -+#define set_dict_float_opt(val, opt) \
321 -+ snprintf(buf, sizeof(buf), "%f", val); \
322 -+ av_dict_set(&lavc_venc_opts, opt, buf, 0)
323 - set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
324 - set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
325 -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
326 -+ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
327 -+ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
328 -+ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
329 -+ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
330 -+ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
331 -+ set_dict_opt(lavc_param_rc_eq, "rc_eq");
332 -+ set_dict_opt(lavc_param_vme, "me_method");
333 -+ set_dict_opt(lavc_param_ibias, "ibias");
334 -+ set_dict_opt(lavc_param_pbias, "pbias");
335 -+ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
336 -+ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
337 - lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
338 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
339 - if (lavc_param_packet_size)
340 -@@ -856,15 +868,9 @@ MOD_init
341 - lavc_venc_context->strict_std_compliance= lavc_param_strict;
342 - lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor;
343 - lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset;
344 -- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish;
345 -- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp;
346 -- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq;
347 -- lavc_venc_context->rc_eq = lavc_param_rc_eq;
348 - lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000;
349 - lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000;
350 - lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024;
351 -- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
352 -- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx;
353 - lavc_venc_context->debug = lavc_param_debug;
354 - lavc_venc_context->last_predictor_count= lavc_param_last_pred;
355 - lavc_venc_context->pre_me = lavc_param_pre_me;
356 -@@ -872,8 +878,6 @@ MOD_init
357 - lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size;
358 - lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality;
359 - lavc_venc_context->me_range = lavc_param_me_range;
360 -- lavc_venc_context->intra_quant_bias = lavc_param_ibias;
361 -- lavc_venc_context->inter_quant_bias = lavc_param_pbias;
362 - lavc_venc_context->coder_type = lavc_param_coder;
363 - lavc_venc_context->context_model = lavc_param_context;
364 - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
365 -@@ -1079,6 +1083,8 @@ MOD_init
366 - lavc_venc_context->flags |= lavc_param_mv0;
367 - if(lavc_param_qp_rd)
368 - av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
369 -+ if (lavc_param_normalize_aqp)
370 -+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
371 - lavc_venc_context->flags |= lavc_param_ilme;
372 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
373 - lavc_venc_context->flags |= lavc_param_trell;
374 -@@ -1087,9 +1093,7 @@ MOD_init
375 - #endif
376 -
377 - if (lavc_param_gray)
378 -- lavc_venc_context->flags |= CODEC_FLAG_GRAY;
379 -- if (lavc_param_normalize_aqp)
380 -- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
381 -+ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
382 -
383 - switch(vob->encode_fields) {
384 - case TC_ENCODE_FIELDS_TOP_FIRST:
385 -@@ -1107,9 +1111,9 @@ MOD_init
386 - }
387 -
388 - lavc_venc_context->flags |= interlacing_active ?
389 -- CODEC_FLAG_INTERLACED_DCT : 0;
390 -+ AV_CODEC_FLAG_INTERLACED_DCT : 0;
391 - lavc_venc_context->flags |= interlacing_active ?
392 -- CODEC_FLAG_INTERLACED_ME : 0;
393 -+ AV_CODEC_FLAG_INTERLACED_ME : 0;
394 -
395 - lavc_venc_context->flags |= lavc_param_psnr;
396 - do_psnr = lavc_param_psnr;
397 -@@ -1156,7 +1160,7 @@ MOD_init
398 - "encoding.");
399 - return TC_EXPORT_ERROR;
400 - }
401 -- lavc_venc_context->flags |= CODEC_FLAG_PASS1;
402 -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
403 - stats_file = fopen(vob->divxlogfile, "w");
404 - if (stats_file == NULL){
405 - tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
406 -@@ -1170,7 +1174,7 @@ MOD_init
407 - "encoding.");
408 - return TC_EXPORT_ERROR;
409 - }
410 -- lavc_venc_context->flags |= CODEC_FLAG_PASS2;
411 -+ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
412 - stats_file= fopen(vob->divxlogfile, "r");
413 - if (stats_file==NULL){
414 - tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
415 -@@ -1201,12 +1205,11 @@ MOD_init
416 - break;
417 - case 3:
418 - /* fixed qscale :p */
419 -- lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
420 -+ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
421 - lavc_venc_frame->quality = vob->divxbitrate;
422 - break;
423 - }
424 -
425 -- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
426 -
427 - /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
428 - if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
429 -Index: transcode-1.1.7/export/ffmpeg_cfg.c
430 -===================================================================
431 ---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
432 -+++ transcode-1.1.7/export/ffmpeg_cfg.c
433 -@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
434 - int lavc_param_pre_me= 1;
435 - int lavc_param_me_subpel_quality= 8;
436 - int lavc_param_me_range=0;
437 --int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
438 --int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
439 -+int lavc_param_ibias=0;
440 -+int lavc_param_pbias=0;
441 - int lavc_param_coder=0;
442 - int lavc_param_context=0;
443 - char *lavc_param_intra_matrix = NULL;
444 -@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
445 - {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
446 - {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
447 - {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
448 -- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
449 -+ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
450 - {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
451 - // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
452 - // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
453 -@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
454 - {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
455 - {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
456 - {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
457 -- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
458 -+ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX},
459 - // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
460 - {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
461 - {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
462 -@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
463 - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
464 - {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
465 - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
466 -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
467 -+ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
468 - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
469 - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
470 - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
471 -@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
472 - {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
473 - {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
474 - {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
475 -- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
476 -+ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
477 - {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
478 - {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
479 - {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
480 -@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
481 - {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
482 - {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
483 - {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
484 -- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
485 -+ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
486 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
487 -- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
488 -+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
489 - #else
490 - {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
491 - #endif
492 -@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
493 - {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
494 - {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
495 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
496 -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
497 -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
498 - #else
499 -- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
500 -+ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
501 - #endif
502 - {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
503 - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
504 -@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
505 - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
506 - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
507 - {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
508 -- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
509 -+ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
510 - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
511 - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
512 - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
513 - {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
514 - {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
515 - {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
516 -- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
517 -+ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME},
518 - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
519 - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
520 - {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
521 -- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
522 -- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
523 -- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
524 -+ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
525 -+ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
526 -+ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
527 - {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
528 - {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
529 - {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
530 -Index: transcode-1.1.7/import/import_ffmpeg.c
531 -===================================================================
532 ---- transcode-1.1.7.orig/import/import_ffmpeg.c
533 -+++ transcode-1.1.7/import/import_ffmpeg.c
534 -@@ -361,7 +361,7 @@ do_avi:
535 - lavc_dec_context->width = x_dim;
536 - lavc_dec_context->height = y_dim;
537 -
538 -- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
539 -+ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
540 - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
541 - lavc_dec_context->error_resilience = 2;
542 - #else
543
544 diff --git a/media-video/transcode/transcode-1.1.7-r4.ebuild b/media-video/transcode/transcode-1.1.7-r4.ebuild
545 index 1091cd557b8..2eabda9fb10 100644
546 --- a/media-video/transcode/transcode-1.1.7-r4.ebuild
547 +++ b/media-video/transcode/transcode-1.1.7-r4.ebuild
548 @@ -7,7 +7,8 @@ inherit autotools libtool multilib
549 DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
550 HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
551 SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
552 - https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
553 + https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
554 + https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-1.1.7-ffmpeg4.patch.xz"
555
556 LICENSE="GPL-2"
557 SLOT="0"
558 @@ -78,7 +79,7 @@ src_prepare() {
559 fi
560
561 if has_version '>=media-video/ffmpeg-4' ; then
562 - PATCHES+=( "${FILESDIR}/ffmpeg4.patch" )
563 + PATCHES+=( "${WORKDIR}/transcode-1.1.7-ffmpeg4.patch" )
564 fi
565
566 default
567
568 diff --git a/media-video/transcode/transcode-1.1.7-r5.ebuild b/media-video/transcode/transcode-1.1.7-r5.ebuild
569 index 6af3a27f947..cd2ac21071c 100644
570 --- a/media-video/transcode/transcode-1.1.7-r5.ebuild
571 +++ b/media-video/transcode/transcode-1.1.7-r5.ebuild
572 @@ -7,7 +7,8 @@ inherit autotools libtool multilib
573 DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
574 HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
575 SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
576 - https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
577 + https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2
578 + https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-1.1.7-ffmpeg4.patch.xz"
579
580 LICENSE="GPL-2"
581 SLOT="0"
582 @@ -80,7 +81,7 @@ src_prepare() {
583 fi
584
585 if has_version '>=media-video/ffmpeg-4' ; then
586 - PATCHES+=( "${FILESDIR}/ffmpeg4.patch" )
587 + PATCHES+=( "${WORKDIR}/transcode-1.1.7-ffmpeg4.patch" )
588 fi
589
590 default