[gentoo-commits] repo/gentoo:master commit in: media-video/transcode/, media-video/transcode/files/

[Michał Górny]

commit:     b33695efbd113e244f04aa56b05c7bb54245ea47
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 23:08:09 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec  9 23:13:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33695ef

media-video/transcode: [QA] Move patches to a distfile

Closes: https://bugs.gentoo.org/620604

 media-video/transcode/Manifest                     |   4 +-
 .../files/transcode-1.1.7-ffmpeg-0.10.patch        |  15 -
 .../files/transcode-1.1.7-ffmpeg-0.11.patch        | 303 -----------
 .../transcode/files/transcode-1.1.7-ffmpeg.patch   |  51 --
 .../transcode/files/transcode-1.1.7-ffmpeg2.patch  | 557 ---------------------
 .../transcode/files/transcode-1.1.7-ffmpeg24.patch |  18 -
 .../transcode/files/transcode-1.1.7-ffmpeg29.patch | 352 -------------
 .../files/transcode-1.1.7-freetype251.patch        |  12 -
 .../transcode/files/transcode-1.1.7-libav-10.patch |  36 --
 .../transcode/files/transcode-1.1.7-libav-9.patch  |  31 --
 .../files/transcode-1.1.7-preset-force.patch       |  28 --
 .../files/transcode-1.1.7-preset-free.patch        |  34 --
 media-video/transcode/transcode-1.1.7-r3.ebuild    |  26 +-
 13 files changed, 15 insertions(+), 1452 deletions(-)

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 51ff3e47717..557759b9b33 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,2 +1,2 @@
-DIST transcode-1.1.7-imagemagick7.patch 34353 SHA256 4ede15540ea6932954ac332c12dde130bf48e7e4773d1e04d3c3f23038c6ac51 SHA512 4eface4bbeb41bf6b44f4efa9bb6e77a0dbb6e22d881261a5884ab843c98ffaf1f40c180d819db6fd48ff81046032b90d11f771d98ba366d2ee4fab94bb99b18 WHIRLPOOL dbd356b24c62d071f989f42969bacbc851782c5125f30724f673b2e50c0be56a15a38d2c63032ee96f0f184b4affe62ef11323a9ddb6fca0955160dec7cb96ba
-DIST transcode-1.1.7.tar.bz2 2183627 SHA256 1e4e72d8e0dd62a80b8dd90699f5ca64c9b0cb37a5c9325c184166a9654f0a92 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f WHIRLPOOL ccd085b3a2638de92c2d589ff93038fed3d1a760d3513fde2946a805f7efed87813850f5e9eee306ed8efd3608ad9492d16f4c41bd6278379995deb22f92354e
+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

diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
deleted file mode 100644
index 5879b24d267..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/401287
-
---- a/filter/filter_pp.c
-+++ b/filter/filter_pp.c
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 

diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch
deleted file mode 100644
index 871d073fead..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg-0.11.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-Fix build with ffmpeg 0.11.
-https://bugs.gentoo.org/show_bug.cgi?id=419551
-Author: Brennan Shacklett
-
-diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c
---- transcode-1.1.7-orig/encode/encode_lavc.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/encode/encode_lavc.c	2012-07-03 10:47:03.528009149 -0700
-@@ -114,6 +114,7 @@
- 
-     AVFrame ff_venc_frame;
-     AVCodecContext ff_vcontext;
-+    AVDictionary ** ff_opts;
- 
-     AVCodec *ff_vcodec;
- 
-@@ -1036,14 +1037,10 @@
-     SET_FLAG(pd, mv0);
-     SET_FLAG(pd, cbp);
-     SET_FLAG(pd, qpel);
--    SET_FLAG(pd, alt);
--    SET_FLAG(pd, vdpart);
-     SET_FLAG(pd, naq);
-     SET_FLAG(pd, ilme);
-     SET_FLAG(pd, ildct);
-     SET_FLAG(pd, aic);
--    SET_FLAG(pd, aiv);
--    SET_FLAG(pd, umv);
-     SET_FLAG(pd, psnr);
-     SET_FLAG(pd, trell);
-     SET_FLAG(pd, gray);
-@@ -1064,6 +1061,18 @@
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
-     }
-+    if (pd->confdata.flags.alt) {
-+        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
-+    }
-+    if (pd->confdata.flags.vdpart) {
-+        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
-+    }
-+    if (pd->confdata.flags.umv) {
-+        av_dict_set(pd->ff_opts, "umv", "1", 0);
-+    }
-+    if (pd->confdata.flags.aiv) {
-+        av_dict_set(pd->ff_opts, "aiv", "1", 0);
-+    }
- }
- 
- #undef SET_FLAG
-@@ -1184,18 +1193,18 @@
-         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
-         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
--        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN },
-+        { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-         { "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 },
--        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART },
-+        { "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 },
- #endif
--        { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV },
--        { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV },
-+        { "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 },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
-@@ -1387,7 +1396,7 @@
-                     pd->confdata.thread_count,
-                     (pd->confdata.thread_count > 1) ?"s" :"");
-     }
--    avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count);
-+    pd->ff_vcontext.thread_count = pd->confdata.thread_count;
- 
-     pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd));
-     if (pd->ff_vcodec == NULL) {
-@@ -1397,11 +1406,11 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec);
-+    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
-     TC_UNLOCK_LIBAVCODEC;
- 
-     if (ret < 0) {
--        tc_log_error(MOD_NAME, "avcodec_open() failed");
-+        tc_log_error(MOD_NAME, "avcodec_open2() failed");
-         goto failed;
-     }
-     /* finally, pass up the extradata, if any */
-diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 13:15:23.918019415 -0700
-@@ -122,6 +122,7 @@
- static AVFrame             *lavc_convert_frame = NULL;
- 
- static AVCodec             *lavc_venc_codec = NULL;
-+static AVDictionary        **lavc_venc_opts = NULL;
- static AVFrame             *lavc_venc_frame = NULL;
- static AVCodecContext      *lavc_venc_context;
- static avi_t               *avifile = NULL;
-@@ -180,7 +181,7 @@
- 
- 
- /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
--#include <libavcodec/opt.h>
-+#include <libavutil/opt.h>
- #include <libavutil/avstring.h>
- #include <libswscale/swscale.h>
- 
-@@ -470,7 +471,6 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    avcodec_init();
-     avcodec_register_all();
-     TC_UNLOCK_LIBAVCODEC;
- 
-@@ -634,7 +634,7 @@
-         lavc_param_rc_max_rate = 2516;
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
-+        lavc_param_scan_offset = 1;
- 
-         break;
- 
-@@ -674,7 +674,7 @@
- 
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
-+        lavc_param_scan_offset = 1;
- 
-         break;
- 
-@@ -887,7 +887,7 @@
- 		    lavc_venc_context->thread_count);
-     }
- 
--    avcodec_thread_init(lavc_venc_context, lavc_param_threads);
-+    lavc_venc_context->thread_count = lavc_param_threads;
- 
-     if (lavc_param_intra_matrix) {
-         char *tmp;
-@@ -1065,15 +1065,10 @@
-     lavc_venc_context->flags |= lavc_param_closedgop;
-     lavc_venc_context->flags |= lavc_param_trunc;
-     lavc_venc_context->flags |= lavc_param_aic;
--    lavc_venc_context->flags |= lavc_param_umv;
-     lavc_venc_context->flags |= lavc_param_v4mv;
--    lavc_venc_context->flags |= lavc_param_data_partitioning;
-     lavc_venc_context->flags |= lavc_param_cbp;
-     lavc_venc_context->flags |= lavc_param_mv0;
-     lavc_venc_context->flags |= lavc_param_qp_rd;
--    lavc_venc_context->flags |= lavc_param_scan_offset;
--    lavc_venc_context->flags |= lavc_param_ss;
--    lavc_venc_context->flags |= lavc_param_alt;
-     lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     lavc_venc_context->flags |= lavc_param_trell;
-@@ -1203,7 +1198,6 @@
- 
-     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) {
- 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
-@@ -1241,20 +1235,39 @@
- 		}
- 	}
- 
-+    if (lavc_param_scan_offset) {
-+      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
-+    }
-+
-+    if (lavc_param_ss) {
-+      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
-+    }
-+
-+    if (lavc_param_alt) {
-+      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
-+    }
-+
-+    if (lavc_param_umv) {
-+      av_dict_set(lavc_venc_opts, "umv", "1", 0);
-+    }
-+
-+    if (lavc_param_data_partitioning) {
-+      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
-+    }
- 
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(lavc_venc_context, lavc_venc_codec);
-+    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
-       return TC_EXPORT_ERROR;
-     }
- 
--    if (lavc_venc_context->codec->encode == NULL) {
-+    if (av_codec_is_encoder(lavc_venc_context->codec) == 0) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
--              "(lavc_venc_context->codec->encode == NULL)");
-+              "(av_codec_is_encoder(lavc_venc_context->codec) == 0)");
-       return TC_EXPORT_ERROR;
-     }
- 
-diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c
---- transcode-1.1.7-orig/export/ffmpeg_cfg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/ffmpeg_cfg.c	2012-07-03 10:09:25.011003254 -0700
-@@ -160,9 +160,9 @@
-     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
--    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-+    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-+    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,7 +211,7 @@
- #else
-     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
- #endif    
--    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
-+    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -223,9 +223,9 @@
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
--    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
--    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
--    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
-+    {"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},
-     {"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},
-diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c
---- transcode-1.1.7-orig/import/decode_lavc.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/decode_lavc.c	2012-07-03 10:21:46.085005182 -0700
-@@ -181,7 +181,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   lavc_dec_context->error_resilience  = 2;
- #else
--  lavc_dec_context->error_recognition = 2;
-+  lavc_dec_context->err_recognition = 2;
- #endif
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c
---- transcode-1.1.7-orig/import/import_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/import_ffmpeg.c	2012-07-03 10:19:36.936004841 -0700
-@@ -314,7 +314,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
--    lavc_dec_context->error_recognition = 2;
-+    lavc_dec_context->err_recognition = 2;
- #endif
-     lavc_dec_context->error_concealment = 3;
-     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c
---- transcode-1.1.7-orig/import/probe_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/import/probe_ffmpeg.c	2012-07-03 10:41:42.782008306 -0700
-@@ -99,8 +99,8 @@
- 
-     TC_INIT_LIBAVCODEC;
- 
--    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
--                             NULL, 0, NULL);
-+    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
-+                             NULL, NULL);
-     if (ret != 0) {
-         tc_log_error(__FILE__, "unable to open '%s'"
-                                " (libavformat failure)",
-diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h
---- transcode-1.1.7-orig/libtc/tcavcodec.h	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/libtc/tcavcodec.h	2012-07-03 10:34:43.648007213 -0700
-@@ -53,7 +53,6 @@
- 
- #define TC_INIT_LIBAVCODEC do { \
-     TC_LOCK_LIBAVCODEC; \
--    avcodec_init(); \
-     avcodec_register_all(); \
-     TC_UNLOCK_LIBAVCODEC; \
- } while (0)

diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
deleted file mode 100644
index 1e7459830c1..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/encode/encode_lavc.c
-+++ b/encode/encode_lavc.c
-@@ -955,8 +955,6 @@
-     /* 
-      * context *transcode* (not libavcodec) defaults
-      */
--    pd->ff_vcontext.mb_qmin                 = 2;
--    pd->ff_vcontext.mb_qmax                 = 31;
-     pd->ff_vcontext.max_qdiff               = 3;
-     pd->ff_vcontext.max_b_frames            = 0;
-     pd->ff_vcontext.me_range                = 0;
-@@ -1116,8 +1114,6 @@
-         //  handled by transcode core
-         //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         //  handled by transcode core
--        { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
--        { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
-         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
-         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
---- a/export/ffmpeg_cfg.c
-+++ b/export/ffmpeg_cfg.c
-@@ -34,8 +34,6 @@
- //int lavc_param_vqscale = 0;
- //int lavc_param_vqmin = 2;
- //int lavc_param_vqmax = 31;
--int lavc_param_mb_qmin = 2;
--int lavc_param_mb_qmax = 31;
- int lavc_param_lmin = 2;
- int lavc_param_lmax = 31;
- int lavc_param_vqdiff = 3;
-@@ -143,8 +141,6 @@
- //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
- //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
--    {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
-     {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
-     {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
---- a/export/ffmpeg_cfg.h
-+++ b/export/ffmpeg_cfg.h
-@@ -13,8 +13,6 @@
- //extern int lavc_param_vqscale;
- //extern int lavc_param_vqmin;
- //extern int lavc_param_vqmax;
--extern int lavc_param_mb_qmin;
--extern int lavc_param_mb_qmax;
- extern int lavc_param_lmin;
- extern int lavc_param_lmax;
- extern int lavc_param_vqdiff;

diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
deleted file mode 100644
index 9a770a6a0de..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Fix build with ffmpeg-2.0.
-Fix segfaults introduced by wrong usage of the av_dict API.
-Fix forgotten parts in the libav9 patch.
-
-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
-@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
-     int lmin;
-     int lmax;
-     int me_method;
-+    int luma_elim_threshold;
-+    int chroma_elim_threshold;
-+    int quantizer_noise_shaping;
- 
-     /* same as above for flags */
-     struct {
-@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
- 
-     AVFrame ff_venc_frame;
-     AVCodecContext ff_vcontext;
--    AVDictionary ** ff_opts;
-+    AVDictionary * ff_opts;
- 
-     AVCodec *ff_vcodec;
- 
-@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
-     TC_CODEC_ERROR
- };
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static const enum CodecID tc_lavc_internal_codecs[] = {
-     CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
-     CODEC_ID_H263I, CODEC_ID_H263P,
-@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
-     CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
-     CODEC_ID_NONE
- };
-+#else
-+static const enum AVCodecID tc_lavc_internal_codecs[] = {
-+    AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
-+    AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
-+    AV_CODEC_ID_H264,
-+    AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
-+    AV_CODEC_ID_RV10,
-+    AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
-+    AV_CODEC_ID_DVVIDEO,
-+    AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
-+    AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
-+    AV_CODEC_ID_NONE
-+};
-+#endif
- 
- static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
- 
-@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
- static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
- {
-     /* first of all reinitialize lavc data */
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-     avcodec_get_context_defaults(&pd->ff_vcontext);
-+#else
-+    avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
-+#endif
- 
-     pd->confdata.thread_count = 1;
- 
-@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.mpeg_quant              = 0;
-     pd->ff_vcontext.rc_initial_cplx         = 0.0;
-     pd->ff_vcontext.rc_qsquish              = 1.0;
--    pd->ff_vcontext.luma_elim_threshold     = 0;
--    pd->ff_vcontext.chroma_elim_threshold   = 0;
-+    pd->confdata.luma_elim_threshold     = 0;
-+    pd->confdata.chroma_elim_threshold   = 0;
-     pd->ff_vcontext.strict_std_compliance   = 0;
-     pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
-     pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
-@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.noise_reduction         = 0;
--    pd->ff_vcontext.quantizer_noise_shaping = 0;
-+    pd->confdata.quantizer_noise_shaping = 0;
-     pd->ff_vcontext.flags                   = 0;
- }
- 
-@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
- 
-     pd->ff_vcontext.flags = 0;
-     SET_FLAG(pd, mv0);
--    SET_FLAG(pd, cbp);
-     SET_FLAG(pd, qpel);
-     SET_FLAG(pd, naq);
-     SET_FLAG(pd, ilme);
-@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
-     }
-     if (pd->confdata.flags.alt) {
--        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
-     }
-     if (pd->confdata.flags.vdpart) {
--        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
-     }
-     if (pd->confdata.flags.umv) {
--        av_dict_set(pd->ff_opts, "umv", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "umv", "1", 0);
-     }
-     if (pd->confdata.flags.aiv) {
--        av_dict_set(pd->ff_opts, "aiv", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
-     }
-+    if (pd->confdata.flags.cbp) {
-+    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
-+    }
-+
-+    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)
-+
-+    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");
- }
- 
- #undef SET_FLAG
-@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
-         { "vrc_init_cplx", PCTX(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 },
--        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
--        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+        { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+        { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
-         { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
-         { "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 },
-         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
--        { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-+        { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-     
-         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
--        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-+        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
-         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
- 
-     pd = self->userdata;
- 
-+    pd->ff_opts = NULL;
-+
-     pd->flush_flag = vob->encoder_flush;
-     
-     /* FIXME: move into core? */
-@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
-+    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
-     TC_UNLOCK_LIBAVCODEC;
- 
-     if (ret < 0) {
-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
-@@ -122,7 +122,7 @@ static uint8_t             *img_buffer =
- static AVFrame             *lavc_convert_frame = NULL;
- 
- static AVCodec             *lavc_venc_codec = NULL;
--static AVDictionary        **lavc_venc_opts = NULL;
-+static AVDictionary        *lavc_venc_opts = NULL;
- static AVFrame             *lavc_venc_frame = NULL;
- static AVCodecContext      *lavc_venc_context;
- static avi_t               *avifile = NULL;
-@@ -486,7 +486,7 @@ MOD_init
- 		            codec->name, codec->fourCC, codec->comments);
-     }
- 
--    lavc_venc_context = avcodec_alloc_context();
-+    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
-     lavc_venc_frame   = avcodec_alloc_frame();
- 
-     lavc_convert_frame= avcodec_alloc_frame();
-@@ -838,8 +838,13 @@ MOD_init
-     lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
-     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
-     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
--    lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
--    lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
-+
-+    char buf[1024];
-+#define set_dict_opt(val, opt) \
-+	snprintf(buf, sizeof(buf), "%i", val); \
-+	av_dict_set(&lavc_venc_opts, opt, buf, 0)
-+    set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
-+    set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
-     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     if (lavc_param_packet_size)
-@@ -870,7 +875,7 @@ MOD_init
-     lavc_venc_context->context_model      = lavc_param_context;
-     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-     lavc_venc_context->noise_reduction    = lavc_param_noise_reduction;
--    lavc_venc_context->inter_threshold    = lavc_param_inter_threshold;
-+    set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
-     lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
-     lavc_venc_context->skip_top           = lavc_param_skip_top;
-     lavc_venc_context->skip_bottom        = lavc_param_skip_bottom;
-@@ -1066,9 +1071,11 @@ MOD_init
-     lavc_venc_context->flags |= lavc_param_trunc;
-     lavc_venc_context->flags |= lavc_param_aic;
-     lavc_venc_context->flags |= lavc_param_v4mv;
--    lavc_venc_context->flags |= lavc_param_cbp;
-+    if(lavc_param_cbp)
-+    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
-     lavc_venc_context->flags |= lavc_param_mv0;
--    lavc_venc_context->flags |= lavc_param_qp_rd;
-+    if(lavc_param_qp_rd)
-+    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
-     lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     lavc_venc_context->flags |= lavc_param_trell;
-@@ -1238,29 +1245,29 @@ MOD_init
- 	}
- 
-     if (lavc_param_scan_offset) {
--      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
-     }
- 
-     if (lavc_param_ss) {
--      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
-     }
- 
-     if (lavc_param_alt) {
--      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
-     }
- 
-     if (lavc_param_umv) {
--      av_dict_set(lavc_venc_opts, "umv", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "umv", "1", 0);
-     }
- 
-     if (lavc_param_data_partitioning) {
--      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
-     }
- 
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
-+    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
-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
-@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
-     {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
--    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
-+    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
--    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-+    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
-     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-Index: transcode-1.1.7/export/aud_aux.c
-===================================================================
---- transcode-1.1.7.orig/export/aud_aux.c
-+++ transcode-1.1.7/export/aud_aux.c
-@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
- 
-     switch (o_codec) {
-       case   0x50:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         codeid = CODEC_ID_MP2;
-+#else
-+        codeid = AV_CODEC_ID_MP2;
-+#endif
-         break;
-       case 0x2000:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         codeid = CODEC_ID_AC3;
-+#else
-+        codeid = AV_CODEC_ID_AC3;
-+#endif
-         break;
-       default:
-         tc_warn("cannot init ffmpeg with %x", o_codec);
-@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
- 
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
--    avcodec_get_context_defaults(&mpa_ctx);
-+    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
- #if LIBAVCODEC_VERSION_MAJOR < 53
-     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
- #else
-@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(&mpa_ctx, mpa_codec);
-+    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
-@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
--                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-+                (codeid == CODEC_ID_MP2)
-+#else
-+                (codeid == AV_CODEC_ID_MP2)
-+#endif
-+                ?"mpa" :"ac3");
-         return(TC_EXPORT_ERROR);
-     }
- 
-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
-@@ -58,6 +58,7 @@ struct ffmpeg_codec {
- };
- 
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-     {"MP41", "DIV1", ""}},
-@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
-     {"Y42B", ""}},
-   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+    {"MP41", "DIV1", ""}},
-+  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+    {"MP42", "DIV2", ""}},
-+  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
-+    {"MPG1", ""}},
-+  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+    {"DVSD", ""}},
-+  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+    {"WMV1", ""}},
-+  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+    {"WMV2", ""}},
-+  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+    {"HFYU", ""}},
-+  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+    {"I263", ""}},
-+  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+    {"H263", "U263", "VIV1", ""}},
-+  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
-+    {"H264", "h264", "X264", "x264", "avc1", ""}},
-+  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+    {"RV10", "RV13", ""}},
-+  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+    {"SVQ1", ""}},
-+  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+    {"SVQ3", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+    {"MPG2", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
-+    {"MPG2", ""}},
-+  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
-+    {"ASV1", ""}},
-+  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
-+    {"ASV2", ""}},
-+  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
-+    {"FFV1", ""}},
-+  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
-+    {"I420", "IYUV", ""}},
-+  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
-+    {"Y42B", ""}},
-+  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
- 
- #define BUFFER_SIZE SIZE_RGB_FRAME
- 
-@@ -302,7 +302,7 @@ do_avi:
- 
-     // Set these to the expected values so that ffmpeg's decoder can
-     // properly detect interlaced input.
--    lavc_dec_context = avcodec_alloc_context();
-+    lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
-     if (lavc_dec_context == NULL) {
-       tc_log_error(MOD_NAME, "Could not allocate enough memory.");
-       return TC_IMPORT_ERROR;
-@@ -324,6 +375,7 @@ do_avi:
-     // XXX: some codecs need extra data
-     switch (codec->id)
-     {
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       case CODEC_ID_MJPEG: extra_data_size  = 28; break;
-       case CODEC_ID_LJPEG: extra_data_size  = 28; break;
-       case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-@@ -331,6 +383,15 @@ do_avi:
-       case CODEC_ID_ASV2: extra_data_size = 8; break;
-       case CODEC_ID_WMV1: extra_data_size = 4; break;
-       case CODEC_ID_WMV2: extra_data_size = 4; break;
-+#else
-+      case AV_CODEC_ID_MJPEG: extra_data_size  = 28; break;
-+      case AV_CODEC_ID_LJPEG: extra_data_size  = 28; break;
-+      case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-+      case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
-+      case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
-+      case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
-+      case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
-+#endif
-       default: extra_data_size = 0; break;
-     }
- 
-@@ -344,7 +344,7 @@ do_avi:
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
-+    ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
-@@ -360,7 +421,11 @@ do_avi:
-         frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
- 
- 	// we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+        if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- 	  enable_levels_filter();
-         }
-         break;
-@@ -434,7 +499,11 @@ do_dv:
-       }
- 
-       // we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+      if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
-         enable_levels_filter();
-       }
- 
-@@ -504,13 +573,25 @@ MOD_decode {
-       int bkey = 0;
- 
-       // check for keyframes
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       if (codec->id == CODEC_ID_MSMPEG4V3) {
-+#else
-+      if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
-+#endif
- 	if (divx3_is_key(buffer)) bkey = 1;
-       }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       else if (codec->id == CODEC_ID_MPEG4) {
-+#else
-+      else if (codec->id == AV_CODEC_ID_MPEG4) {
-+#endif
- 	if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
-       }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       else if (codec->id == CODEC_ID_MJPEG) {
-+#else
-+      else if (codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- 	bkey = 1;
-       }
- 
---- a/import/decode_lavc.c
-+++ b/import/decode_lavc.c
-@@ -57,6 +57,7 @@ struct ffmpeg_codec {
- };
- 
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-     {"MP41", "DIV1", ""}},
-@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-     {"MPG2", ""}},
-   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+    {"MP41", "DIV1", ""}},
-+  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+    {"MP42", "DIV2", ""}},
-+  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
-+    {"MPG1", ""}},
-+  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+    {"DVSD", ""}},
-+  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+    {"WMV1", ""}},
-+  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+    {"WMV2", ""}},
-+  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+    {"HFYU", ""}},
-+  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+    {"I263", ""}},
-+  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+    {"H263", "U263", "VIV1", ""}},
-+  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+    {"RV10", "RV13", ""}},
-+  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+    {"SVQ1", ""}},
-+  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+    {"SVQ3", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+    {"MPG2", ""}},
-+  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
- 
- 
- static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id)

diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
deleted file mode 100644
index 57a91774abc..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg24.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=520190
-
-Index: transcode-1.1.7/import/probe_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/probe_ffmpeg.c
-+++ transcode-1.1.7/import/probe_ffmpeg.c
-@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe)
- 
-     translate_info(lavf_dmx_context, ipipe->probe_info);
- 
-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
-+    avformat_close_input(&lavf_dmx_context);
-+#else
-     av_close_input_file(lavf_dmx_context);
-+#endif
-     return;
- }
- 

diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch
deleted file mode 100644
index 7901fc3cc34..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-ffmpeg29.patch
+++ /dev/null
@@ -1,352 +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
-@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
-                                      vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
--                    PIX_FMT_YUV420P,
-+                    AV_PIX_FMT_YUV420P,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
- }
- 
-@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf
-                     IMG_YUV_DEFAULT,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV422P,
-+                   AV_PIX_FMT_YUV422P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(src, IMG_YUV_DEFAULT,
-                   pd->ff_venc_frame.data, IMG_YUV422P,
-@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL
-                     IMG_YUV422P,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV420P,
-+                   AV_PIX_FMT_YUV420P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(src, IMG_YUV422P,
-                   pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf
-                                              vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
--                   PIX_FMT_YUV422P,
-+                   AV_PIX_FMT_YUV422P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
- 
- }
-@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav
-                                    vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV420P,
-+                   AV_PIX_FMT_YUV420P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT,
-                   pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
-       case CODEC_YUV:
-         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
-             pd->tc_pix_fmt = TC_CODEC_YUV422P;
--            pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
-+            pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
-             pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
-         } else {
-             pd->tc_pix_fmt = TC_CODEC_YUV420P;
-             pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                       ? PIX_FMT_YUVJ420P
--                                       : PIX_FMT_YUV420P;
-+                                       ? AV_PIX_FMT_YUVJ420P
-+                                       : AV_PIX_FMT_YUV420P;
-             pd->pre_encode_video = pre_encode_video_yuv420p;
-         }
-         break;
-       case CODEC_YUV422:
-         pd->tc_pix_fmt = TC_CODEC_YUV422P;
-         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                   ? PIX_FMT_YUVJ422P
--                                   : PIX_FMT_YUV422P;
-+                                   ? AV_PIX_FMT_YUVJ422P
-+                                   : AV_PIX_FMT_YUV422P;
-         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
-             pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
-         } else {
-@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
-       case CODEC_RGB:
-         pd->tc_pix_fmt = TC_CODEC_RGB;
-         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
--                                        ? PIX_FMT_YUV422P
-+                                        ? AV_PIX_FMT_YUV422P
-                                         : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                           ? PIX_FMT_YUVJ420P
--                                           : PIX_FMT_YUV420P;
-+                                           ? AV_PIX_FMT_YUVJ420P
-+                                           : AV_PIX_FMT_YUV420P;
-         pd->pre_encode_video = pre_encode_video_rgb24;
-         break;
-       default:
-@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns
-     /* FIXME: move into core? */
-     TC_INIT_LIBAVCODEC;
- 
--    avcodec_get_frame_defaults(&pd->ff_venc_frame);
-+    av_frame_unref(&pd->ff_venc_frame);
-     /*
-      * auxiliary config data needs to be blanked too
-      * before any other operation
-@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule
-                                 vframe_list_t *outframe)
- {
-     TCLavcPrivateData *pd = NULL;
-+    AVPacket pkt;
-+    int ret, got_packet = 0;
- 
-     TC_MODULE_SELF_CHECK(self, "encode_video");
- 
-@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule
- 
-     pd->pre_encode_video(pd, inframe); 
- 
-+    av_init_packet(&pkt);
-+    pkt.data = outframe->video_buf;
-+    pkt.size = inframe->video_size;
-+
-     TC_LOCK_LIBAVCODEC;
--    outframe->video_len = avcodec_encode_video(&pd->ff_vcontext,
--                                               outframe->video_buf,
--                                               inframe->video_size,
--                                               &pd->ff_venc_frame);
-+    ret = avcodec_encode_video2(&pd->ff_vcontext,   &pkt,
-+    				&pd->ff_venc_frame, &got_packet);
-     TC_UNLOCK_LIBAVCODEC;
-+    outframe->video_len = ret ? ret : pkt.size;
- 
-     if (outframe->video_len < 0) {
-         tc_log_warn(MOD_NAME, "encoder error: size (%i)",
-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
-@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c
-     for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
- 		/* GLUE: +if */
- 		if (type == AVMEDIA_TYPE_VIDEO) {
--        const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
--        if(o2)
--            ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
-+        o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
-+        if(o)
-+            ret = av_opt_set(avcodec_opts[type], opt, arg, 0);
- 		/* GLUE: +if */
- 		}
-     }
-@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c
-         if(opt[0] == 'a')
-             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
-         else */ if(opt[0] == 'v')
--            ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o);
-+	{
-+	    o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0);
-+            ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0);
-+	}
- 		/* GLUE: disabling
-         else if(opt[0] == 's')
-             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o);
-@@ -487,10 +490,10 @@ MOD_init
-     }
- 
-     lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
--    lavc_venc_frame   = avcodec_alloc_frame();
-+    lavc_venc_frame   = av_frame_alloc();
- 
--    lavc_convert_frame= avcodec_alloc_frame();
--    size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
-+    lavc_convert_frame= av_frame_alloc();
-+    size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
-     enc_buffer = tc_malloc(size);
- 
-     if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) {
-@@ -1114,7 +1117,7 @@ MOD_init
-     lavc_venc_context->prediction_method = lavc_param_prediction_method;
- 
-     if(is_huffyuv)
--        lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+        lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
-     else
-     {
-         switch(pix_fmt)
-@@ -1123,18 +1126,18 @@ MOD_init
-             case CODEC_RGB:
-             {
-                 if(is_mjpeg)
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P;
-                 else
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P;
-                 break;
-             }
- 
-             case CODEC_YUV422:
-             {
-                 if(is_mjpeg)
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P;
-                 else
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
-                 break;
-             }
- 
-@@ -1596,6 +1599,8 @@ MOD_encode
- 
-   int out_size;
-   const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
-+  AVPacket pkt;
-+  int ret, got_packet = 0;
- 
-   if (param->flag == TC_VIDEO) {
- 
-@@ -1620,7 +1625,7 @@ MOD_encode
- 	        	YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT,
- 			                	lavc_venc_context->width, lavc_venc_context->height);
-                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                               PIX_FMT_YUV422P, lavc_venc_context->width,
-+                               AV_PIX_FMT_YUV422P, lavc_venc_context->width,
-                                lavc_venc_context->height);
-         		/* FIXME: can't use tcv_convert (see decode_lavc.c) */
-                 ac_imgconvert(src, IMG_YUV_DEFAULT,
-@@ -1650,7 +1655,7 @@ MOD_encode
- 		                		lavc_venc_context->width,
-                                 lavc_venc_context->height);
-                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                               PIX_FMT_YUV420P, lavc_venc_context->width,
-+                               AV_PIX_FMT_YUV420P, lavc_venc_context->width,
-                                lavc_venc_context->height);
-                 ac_imgconvert(src, IMG_YUV422P,
-                               lavc_venc_frame->data, IMG_YUV420P,
-@@ -1661,7 +1666,7 @@ MOD_encode
- 
-         case CODEC_RGB:
-             avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                           PIX_FMT_YUV420P, lavc_venc_context->width,
-+                           AV_PIX_FMT_YUV420P, lavc_venc_context->width,
-                            lavc_venc_context->height);
-     	    ac_imgconvert(&param->buffer, IMG_RGB_DEFAULT,
-                               lavc_venc_frame->data, IMG_YUV420P,
-@@ -1674,13 +1679,17 @@ MOD_encode
-               return TC_EXPORT_ERROR;
-     }
- 
-+    av_init_packet(&pkt);
-+    pkt.data = enc_buffer;
-+    pkt.size = size;
- 
-     TC_LOCK_LIBAVCODEC;
--    out_size = avcodec_encode_video(lavc_venc_context,
--                                    enc_buffer, size,
--                                    lavc_venc_frame);
-+    ret = avcodec_encode_video2(lavc_venc_context, &pkt,
-+                                    lavc_venc_frame, &got_packet);
-     TC_UNLOCK_LIBAVCODEC;
- 
-+    out_size = ret ? ret : pkt.size;
-+
-     if (out_size < 0) {
-       tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
-       return TC_EXPORT_ERROR;
-Index: transcode-1.1.7/import/decode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/import/decode_lavc.c
-+++ transcode-1.1.7/import/decode_lavc.c
-@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode)
- 
-       // Convert avcodec image to the requested YUV or RGB format
-       switch (lavc_dec_context->pix_fmt) {
--	case PIX_FMT_YUVJ420P:
--	case PIX_FMT_YUV420P:
-+	case AV_PIX_FMT_YUVJ420P:
-+	case AV_PIX_FMT_YUV420P:
- 	    // Remove "dead space" at right edge of planes, if any
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
-@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUV411P:
-+	case AV_PIX_FMT_YUV411P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUVJ422P:
--	case PIX_FMT_YUV422P:
-+	case AV_PIX_FMT_YUVJ422P:
-+	case AV_PIX_FMT_YUV422P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUVJ444P:
--	case PIX_FMT_YUV444P:
-+	case AV_PIX_FMT_YUVJ444P:
-+	case AV_PIX_FMT_YUV444P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-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
-@@ -661,8 +661,8 @@ retry:
- 
-     // Convert avcodec image to our internal YUV or RGB format
-     switch (lavc_dec_context->pix_fmt) {
--      case PIX_FMT_YUVJ420P:
--      case PIX_FMT_YUV420P:
-+      case AV_PIX_FMT_YUVJ420P:
-+      case AV_PIX_FMT_YUV420P:
-         src_fmt = IMG_YUV420P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -693,7 +693,7 @@ retry:
- 	}
-         break;
- 
--      case PIX_FMT_YUV411P:
-+      case AV_PIX_FMT_YUV411P:
-         src_fmt = IMG_YUV411P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -721,8 +721,8 @@ retry:
-         }
-         break;
- 
--      case PIX_FMT_YUVJ422P:
--      case PIX_FMT_YUV422P:
-+      case AV_PIX_FMT_YUVJ422P:
-+      case AV_PIX_FMT_YUV422P:
-         src_fmt = IMG_YUV422P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -750,8 +750,8 @@ retry:
-         }
- 	break;
- 
--      case PIX_FMT_YUVJ444P:
--      case PIX_FMT_YUV444P:
-+      case AV_PIX_FMT_YUVJ444P:
-+      case AV_PIX_FMT_YUV444P:
-         src_fmt = IMG_YUV444P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);

diff --git a/media-video/transcode/files/transcode-1.1.7-freetype251.patch b/media-video/transcode/files/transcode-1.1.7-freetype251.patch
deleted file mode 100644
index 59c6ab35a51..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-freetype251.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- transcode-1.1.7/filter/subtitler/load_font.c
-+++ transcode-1.1.7/filter/subtitler/load_font.c
-@@ -47,8 +47,8 @@
- // FreeType specific includes
- #include <ft2build.h>
- #include FT_FREETYPE_H
-+#include FT_GLYPH_H
- 
--#include <freetype/ftglyph.h>
- 
- /**
-  * @file bswap.h

diff --git a/media-video/transcode/files/transcode-1.1.7-libav-10.patch b/media-video/transcode/files/transcode-1.1.7-libav-10.patch
deleted file mode 100644
index 1f4a24039d7..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-libav-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-fix building w/libav-10
-
-https://wiki.libav.org/Migration/10
-
---- a/filter/filter_resample.c
-+++ b/filter/filter_resample.c
-@@ -37,6 +37,7 @@
- #include "libtc/optstr.h"
- #include "libtc/tcavcodec.h"
- #include "libtc/tcmodule-plugin.h"
-+#include <libavresample/avresample.h>
- 
- 
- typedef struct {
-@@ -45,7 +46,7 @@ typedef struct {
- 
-     int bytes_per_sample;
- 
--    ReSampleContext *resample_ctx;
-+    AVAudioResampleContext *resample_ctx;
- } ResamplePrivateData;
- 
- static const char resample_help[] = ""
---- a/import/probe_ffmpeg.c
-+++ b/import/probe_ffmpeg.c
-@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
-             info->bitrate = st->codec->bit_rate / 1000;
-             info->width = st->codec->width;
-             info->height = st->codec->height;
--            if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
--                info->fps = av_q2d(st->r_frame_rate);
-+            if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
-+                info->fps = av_q2d(st->avg_frame_rate);
-             } else {
-                 /* watch out here */
-                 info->fps = 1.0/av_q2d(st->codec->time_base);

diff --git a/media-video/transcode/files/transcode-1.1.7-libav-9.patch b/media-video/transcode/files/transcode-1.1.7-libav-9.patch
deleted file mode 100644
index a67fb68c698..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-libav-9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/import/probe_ffmpeg.c
-+++ b/import/probe_ffmpeg.c
-@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
-         return;
-     }
- 
--    ret = av_find_stream_info(lavf_dmx_context);
-+    ret = avformat_find_stream_info(lavf_dmx_context, NULL);
-     if (ret < 0) {
-         tc_log_error(__FILE__, "unable to fetch informations from '%s'"
-                                " (libavformat failure)",
---- a/import/decode_lavc.c
-+++ b/import/decode_lavc.c
-@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
- 
-   // Set these to the expected values so that ffmpeg's decoder can
-   // properly detect interlaced input.
--  lavc_dec_context = avcodec_alloc_context();
-+  lavc_dec_context = avcodec_alloc_context3(NULL);
-   if (lavc_dec_context == NULL) {
-       tc_log_error(__FILE__, "Could not allocate enough memory.");
-       goto decoder_error;
-@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
- 
--  if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
-+  if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
-       tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
- 		   codec->name);
-       goto decoder_error;

diff --git a/media-video/transcode/files/transcode-1.1.7-preset-force.patch b/media-video/transcode/files/transcode-1.1.7-preset-force.patch
deleted file mode 100644
index 0d1da8b4f66..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-preset-force.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Do not force using a preset. Do not try to open non-existant preset by default.
-
-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
-@@ -1206,7 +1206,7 @@ MOD_init
-     lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
- 
- 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
--	if (lavc_param_video_preset) {
-+	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
- 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
- 		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
- 
-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
-@@ -124,7 +124,7 @@ int lavc_param_gmc = 0;
- //int lavc_param_atag = 0;
- //int lavc_param_abitrate = 224;
- 
--char *lavc_param_video_preset = "medium";
-+char *lavc_param_video_preset = "none";
- char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg";
- 
- TCConfigEntry lavcopts_conf[]={

diff --git a/media-video/transcode/files/transcode-1.1.7-preset-free.patch b/media-video/transcode/files/transcode-1.1.7-preset-free.patch
deleted file mode 100644
index 00494b94ba9..00000000000
--- a/media-video/transcode/files/transcode-1.1.7-preset-free.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix invalid free when preset file not found
-https://bugs.gentoo.org/show_bug.cgi?id=322945
-Author: Brennan Shacklett
-
-diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c
---- transcode-1.1.7-orig/export/export_ffmpeg.c	2011-11-19 08:50:27.000000000 -0800
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-07-03 20:07:05.669083945 -0700
-@@ -321,7 +321,7 @@
-     }
- 
-     if(!f){
--        fprintf(stderr, "File for preset '%s' not found\n", arg);
-+        tc_log_error(MOD_NAME, "File for preset '%s' not found", arg);
-         av_exit(1);
-     }
- 
-@@ -1207,7 +1207,7 @@
- 	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
- 	if (lavc_param_video_preset) {
- 		avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context;
--		video_codec_name = ffmpeg_codec_name(codec->name);
-+		video_codec_name = av_strdup(ffmpeg_codec_name(codec->name));
- 
- 		const char *preset_start = lavc_param_video_preset;
- 		while (preset_start) {
-@@ -1225,6 +1225,8 @@
- 			if (opt_preset("vpre", preset_name) != 0) {
- 				tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name);
- 			}
-+      av_free(video_codec_name);
-+      video_codec_name = NULL;
- 			if (verbose) {
- 				int i;
- 				tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count);

diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index 3c0ba6e98ec..a5df574512d 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.ebuild
@@ -7,7 +7,7 @@ inherit autotools libtool multilib
 DESCRIPTION="A suite of 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/~polynomial-c/${P}-imagemagick7.patch"
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -56,26 +56,26 @@ REQUIRED_USE="
 	"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-ffmpeg.patch
-	"${FILESDIR}"/${P}-ffmpeg-0.10.patch
-	"${FILESDIR}"/${P}-ffmpeg-0.11.patch
-	"${FILESDIR}"/${P}-preset-free.patch
-	"${FILESDIR}"/${P}-libav-9.patch
-	"${FILESDIR}"/${P}-libav-10.patch
-	"${FILESDIR}"/${P}-preset-force.patch
-	"${FILESDIR}"/${P}-ffmpeg2.patch
-	"${FILESDIR}"/${P}-freetype251.patch
-	"${FILESDIR}"/${P}-ffmpeg24.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.10.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.11.patch
+	"${WORKDIR}"/${P}-patchset/${P}-preset-free.patch
+	"${WORKDIR}"/${P}-patchset/${P}-libav-9.patch
+	"${WORKDIR}"/${P}-patchset/${P}-libav-10.patch
+	"${WORKDIR}"/${P}-patchset/${P}-preset-force.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg2.patch
+	"${WORKDIR}"/${P}-patchset/${P}-freetype251.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
 )
 
 src_prepare() {
 	if has_version '>=media-video/ffmpeg-2.8' ||
 		has_version '>=media-video/libav-12'; then
-		PATCHES+=( "${FILESDIR}"/${P}-ffmpeg29.patch )
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch )
 	fi
 
 	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		PATCHES+=( "${DISTDIR}"/${P}-imagemagick7.patch )
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch )
 	fi
 
 	default