Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 doc/qpdf/DEPENDS                                   |    4 
 doc/qpdf/DETAILS                                   |    2 
 doc/qpdf/HISTORY                                   |    4 
 gnome2-libs/gobject-introspection/DETAILS          |    8 
 gnome2-libs/gobject-introspection/HISTORY          |    3 
 printer/cups-filters/DEPENDS                       |    1 
 printer/cups-filters/HISTORY                       |    3 
 video-libs/libdvdcss/DETAILS                       |    2 
 video-libs/libdvdcss/HISTORY                       |    3 
 video/dvdbackup/HISTORY                            |    3 
 video/dvdbackup/PRE_BUILD                          |    4 
 video/dvdbackup/dvdbackup-dvdread-6.1.patch        |   87 +
 video/transcode/BUILD                              |    2 
 video/transcode/HISTORY                            |   17 
 video/transcode/PRE_BUILD                          |   16 
 video/transcode/ffmpeg4.patch                      |  508 --------
 video/transcode/transcode-1.1.7-ffmpeg-0.10.patch  |   15 
 video/transcode/transcode-1.1.7-ffmpeg-0.11.patch  |  303 -----
 video/transcode/transcode-1.1.7-ffmpeg.patch       |   51 
 video/transcode/transcode-1.1.7-ffmpeg2.patch      |  332 -----
 video/transcode/transcode-1.1.7-freetype251.patch  |   12 
 video/transcode/transcode-1.1.7-libav-9.patch      |   31 
 video/transcode/transcode-1.1.7-preset-force.patch |   28 
 video/transcode/transcode-1.1.7-preset-free.patch  |   34 
 video/transcode/transcode-ffmpeg3.patch            | 1241 
+++++++++++++++++++++
 video/transcode/transcode-ffmpeg4.patch            |  494 ++++++++
 video/transcode/transcode-imagemagick7.patch       |  794 +++++++++++++
 video/transcode/transcode-swresample.patch         |   20 
 28 files changed, 2691 insertions(+), 1331 deletions(-)

New commits:
commit 5cda425adf5a63a65bd15fee53bc1d40e92603b4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnome2-libs/gobject-introspection: version 1.64.1

commit dea2271f5342f113fe7f0a3cfa28c56a2a9cc322
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    printer/cups-filters: add dependency on dejavu-ttf

commit 479c113b29cdddd5b9c4a5980a806f68142a7f10
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    doc/qpdf: version 10.0.0

commit 06ae32fd62a9b817163ac14b043b9dddd3816567
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/dvdbackup: fix compile error

commit 03c36e8d58ca7c7e7c841660cc8783ec89063aa8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/transcode: fix compile errors

commit 1fc17cce4504d66e438408c08db1884033627642
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video-libs/libdvdcss: update WEB_SITE

diff --git a/doc/qpdf/DEPENDS b/doc/qpdf/DEPENDS
index a7bdb8a..1dcbbd6 100755
--- a/doc/qpdf/DEPENDS
+++ b/doc/qpdf/DEPENDS
@@ -3,4 +3,6 @@ depends libxml2 &&
 depends libxslt &&
 depends JPEG    &&
 depends zlib    &&
-depends libtool
+depends libtool &&
+
+optional_depends openssl "--enable-crypto-openssl" 
"--disable-crytpo-openssl" "use openssl as crypto provider"
diff --git a/doc/qpdf/DETAILS b/doc/qpdf/DETAILS
index b4d3fcd..ab883aa 100755
--- a/doc/qpdf/DETAILS
+++ b/doc/qpdf/DETAILS
@@ -1,5 +1,5 @@
            SPELL=qpdf
-         VERSION=9.1.1
+         VERSION=10.0.0
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/doc/qpdf/HISTORY b/doc/qpdf/HISTORY
index 254887c..efc6d00 100644
--- a/doc/qpdf/HISTORY
+++ b/doc/qpdf/HISTORY
@@ -1,3 +1,7 @@
+2020-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 10.0.0
+       * DEPENDS: add optional dependency on openssl
+
 2020-01-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 9.1.1
 
diff --git a/gnome2-libs/gobject-introspection/DETAILS 
b/gnome2-libs/gobject-introspection/DETAILS
index 378ad1a..5242ae3 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,11 +1,11 @@
 source $GRIMOIRE/MESON_FUNCTIONS
            SPELL=gobject-introspection
 if [[ $GOBJECT_INTROSPECTION_BRANCH == devel ]]; then
-         VERSION=1.64.0
-     
SOURCE_HASH=sha512:d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
+         VERSION=1.64.1
+     
SOURCE_HASH=sha512:7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 else
-         VERSION=1.64.0
-     
SOURCE_HASH=sha512:d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae
+         VERSION=1.64.1
+     
SOURCE_HASH=sha512:7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c
 fi
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=${SPELL}-${VERSION}.tar.xz
diff --git a/gnome2-libs/gobject-introspection/HISTORY 
b/gnome2-libs/gobject-introspection/HISTORY
index 3e4ead6..b9688be 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,6 @@
+2020-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.64.1
+
 2020-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: version 1.64.0
 
diff --git a/printer/cups-filters/DEPENDS b/printer/cups-filters/DEPENDS
index acbe611..dfba11b 100755
--- a/printer/cups-filters/DEPENDS
+++ b/printer/cups-filters/DEPENDS
@@ -7,6 +7,7 @@ depends lcms2       &&
 depends freetype2   &&
 depends fontconfig  &&
 depends glib2       &&
+depends dejavu-ttf  &&
 depends shared-mime-info &&
 
 # required for pstopdf script
diff --git a/printer/cups-filters/HISTORY b/printer/cups-filters/HISTORY
index df6ae6d..7d01be8 100644
--- a/printer/cups-filters/HISTORY
+++ b/printer/cups-filters/HISTORY
@@ -1,3 +1,6 @@
+2020-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: add dependency on dejavu-ttf
+
 2020-03-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.27.3
 
diff --git a/video-libs/libdvdcss/DETAILS b/video-libs/libdvdcss/DETAILS
index 64262e0..87c1f3a 100755
--- a/video-libs/libdvdcss/DETAILS
+++ b/video-libs/libdvdcss/DETAILS
@@ -4,7 +4,7 @@
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=https://download.videolan.org/pub/libdvdcss/$VERSION/$SOURCE
-        WEB_SITE=https://developers.videolan.org/libdvdcss/
+        WEB_SITE=https://www.videolan.org/developers/libdvdcss.html
          ENTERED=20010927
       LICENSE[0]=GPL
         KEYWORDS="dvd video libs"
diff --git a/video-libs/libdvdcss/HISTORY b/video-libs/libdvdcss/HISTORY
index d522c89..7b1bbe3 100644
--- a/video-libs/libdvdcss/HISTORY
+++ b/video-libs/libdvdcss/HISTORY
@@ -1,3 +1,6 @@
+2020-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: update WEB_SITE
+
 2018-11-19 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.4.2
 
diff --git a/video/dvdbackup/HISTORY b/video/dvdbackup/HISTORY
index 3165c29..c8582c8 100644
--- a/video/dvdbackup/HISTORY
+++ b/video/dvdbackup/HISTORY
@@ -1,3 +1,6 @@
+2020-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, dvdbackup-dvdread-6.1.patch: fix compile error
+
 2016-09-14 David C. Haley <khoralin AT gmail.com>
        * DETAILS: version bump 0.1.1 -> 0.4.2
          Updated SOURCE_URL & WEB_SITE
diff --git a/video/dvdbackup/PRE_BUILD b/video/dvdbackup/PRE_BUILD
new file mode 100755
index 0000000..668c98b
--- /dev/null
+++ b/video/dvdbackup/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/dvdbackup-dvdread-6.1.patch"
diff --git a/video/dvdbackup/dvdbackup-dvdread-6.1.patch 
b/video/dvdbackup/dvdbackup-dvdread-6.1.patch
new file mode 100644
index 0000000..4cf9022
--- /dev/null
+++ b/video/dvdbackup/dvdbackup-dvdread-6.1.patch
@@ -0,0 +1,87 @@
+--- src/dvdbackup.c.orig 2012-06-24 01:10:29 UTC
++++ src/dvdbackup.c
+@@ -1132,7 +1132,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+       int size;
+ 
+       /* DVD handler */
+-      ifo_handle_t* ifo_file = NULL;
++      dvd_file_t* ifo_file = NULL;
+ 
+       if (title_set_info->number_of_title_sets + 1 < title_set) {
+               return(1);
+@@ -1181,7 +1181,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+       if ((streamout_ifo = open(targetname_ifo, O_WRONLY | O_CREAT | 
O_TRUNC, 0666)) == -1) {
+               fprintf(stderr, _("Error creating %s\n"), targetname_ifo);
+               perror(PACKAGE);
+-              ifoClose(ifo_file);
++              DVDCloseFile(ifo_file);
+               free(buffer);
+               close(streamout_ifo);
+               close(streamout_bup);
+@@ -1191,7 +1191,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+       if ((streamout_bup = open(targetname_bup, O_WRONLY | O_CREAT | 
O_TRUNC, 0666)) == -1) {
+               fprintf(stderr, _("Error creating %s\n"), targetname_bup);
+               perror(PACKAGE);
+-              ifoClose(ifo_file);
++              DVDCloseFile(ifo_file);
+               free(buffer);
+               close(streamout_ifo);
+               close(streamout_bup);
+@@ -1200,31 +1200,31 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, 
title_set_
+ 
+       /* Copy VIDEO_TS.IFO, since it's a small file try to copy it in one 
shot */
+ 
+-      if ((ifo_file = ifoOpen(dvd, title_set))== 0) {
++      if ((ifo_file = DVDOpenFile(dvd, title_set, DVD_READ_INFO_FILE))== 0) 
{
+               fprintf(stderr, _("Failed opening IFO for title set %d\n"), 
title_set);
+-              ifoClose(ifo_file);
++              DVDCloseFile(ifo_file);
+               free(buffer);
+               close(streamout_ifo);
+               close(streamout_bup);
+               return 1;
+       }
+ 
+-      size = DVDFileSize(ifo_file->file) * DVD_VIDEO_LB_LEN;
++      size = DVDFileSize(ifo_file) * DVD_VIDEO_LB_LEN;
+ 
+       if ((buffer = (unsigned char *)malloc(size * sizeof(unsigned char))) 
== NULL) {
+               perror(PACKAGE);
+-              ifoClose(ifo_file);
++              DVDCloseFile(ifo_file);
+               free(buffer);
+               close(streamout_ifo);
+               close(streamout_bup);
+               return 1;
+       }
+ 
+-      DVDFileSeek(ifo_file->file, 0);
++      DVDFileSeek(ifo_file, 0);
+ 
+-      if (DVDReadBytes(ifo_file->file,buffer,size) != size) {
++      if (DVDReadBytes(ifo_file,buffer,size) != size) {
+               fprintf(stderr, _("Error reading IFO for title set %d\n"), 
title_set);
+-              ifoClose(ifo_file);
++              DVDCloseFile(ifo_file);
+               free(buffer);
+               close(streamout_ifo);
+               close(streamout_bup);
+@@ -1234,7 +1234,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+       if (write(streamout_ifo,buffer,size) != size) {
+               fprintf(stderr, _("Error writing %s\n"),targetname_ifo);
+-              ifoClose(ifo_file);
++              DVDCloseFile(ifo_file);
+               free(buffer);
+               close(streamout_ifo);
+               close(streamout_bup);
+@@ -1243,7 +1243,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_
+ 
+       if (write(streamout_bup,buffer,size) != size) {
+               fprintf(stderr, _("Error writing %s\n"),targetname_bup);
+-              ifoClose(ifo_file);
++              DVDCloseFile(ifo_file);
+               free(buffer);
+               close(streamout_ifo);
+               close(streamout_bup);
+-----
diff --git a/video/transcode/BUILD b/video/transcode/BUILD
index 4fc923d..dceb481 100755
--- a/video/transcode/BUILD
+++ b/video/transcode/BUILD
@@ -3,7 +3,7 @@ if echo $OPTS | grep -q enable-lzo; then
   export CPPFLAGS="$CPPFLAGS -I/usr/include/lzo"
 fi &&
 OPTS="$OPTS --enable-v4l"  &&
-OPTS="$OPTS --disable-imagemagick" &&
+
 make_single                &&
 default_build              &&
 make_normal
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 9f30bc3..dc3abef 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,20 @@
+2020-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * transcode-1.1.7-ffmpeg-0.10.patch,
+         transcode-1.1.7-ffmpeg-0.11.patch,
+         transcode-1.1.7-ffmpeg.patch,
+         transcode-1.1.7-ffmpeg2.patch,
+         transcode-1.1.7-freetype251.patch,
+         transcode-1.1.7-libav-9.patch,
+         transcode-1.1.7-preset-force.patch,
+         transcode-1.1.7-preset-free.patch,
+         ffmpeg4.patch,
+         transcode-ffmpeg3.patch,
+         transcode-ffmpeg4.patch,
+         transcode-imagemagick7.patch,
+         transcode-swresample.patch, PRE_BUILD: replace our patches with ones
+         from archlinux to fix compile errors
+       * BUILD: make imagemagick dependency optional again
+
 2020-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * PRE_BUILD, ffmpeg4.patch: add patch from gentoo to fix compile 
errors
        * BUILD: disable imagemagick to avoid compile error
diff --git a/video/transcode/PRE_BUILD b/video/transcode/PRE_BUILD
index cb6a733..ca11c80 100755
--- a/video/transcode/PRE_BUILD
+++ b/video/transcode/PRE_BUILD
@@ -1,13 +1,11 @@
 default_pre_build      &&
 cd $SOURCE_DIRECTORY   &&
 
-patch -p0 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg.patch        &&
-patch -p0 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg-0.10.patch   &&
-patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg-0.11.patch   &&
-patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-preset-free.patch   &&
-patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-libav-9.patch       &&
-patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-preset-force.patch  &&
-patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-ffmpeg2.patch       &&
-patch -p1 < $SPELL_DIRECTORY/transcode-1.1.7-freetype251.patch   &&
-patch -p1 < $SPELL_DIRECTORY/ffmpeg4.patch
+for patch in $SPELL_DIRECTORY/transcode-ffmpeg3.patch \
+       $SPELL_DIRECTORY/transcode-imagemagick7.patch \
+       $SPELL_DIRECTORY/transcode-ffmpeg4.patch \
+       $SPELL_DIRECTORY/transcode-swresample.patch; do
+  message "${MESSAGE_COLOR}applying $patch$DEFAULT_COLOR" &&
+  patch -p1 < $patch || return 1
+done
 
diff --git a/video/transcode/ffmpeg4.patch b/video/transcode/ffmpeg4.patch
deleted file mode 100644
index 9ad765e..0000000
--- a/video/transcode/ffmpeg4.patch
+++ /dev/null
@@ -1,508 +0,0 @@
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
-     int luma_elim_threshold;
-     int chroma_elim_threshold;
-     int quantizer_noise_shaping;
-+    int inter_quant_bias;
-+    int intra_quant_bias;
-+    int scenechange_factor;
-+    int rc_strategy;
-+    float rc_initial_cplx;
-+    float rc_qsquish;
-+    float border_masking;
- 
-     /* same as above for flags */
-     struct {
-@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
-     switch (vob->divxmultipass) {
-       case 1:
-         CAN_DO_MULTIPASS(multipass_flag);
--        pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
-         pd->stats_file = fopen(vob->divxlogfile, "w");
-         if (pd->stats_file == NULL) {
-             tc_log_error(MOD_NAME, "could not create 2pass log file"
-@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
-         break;
-       case 2:
-         CAN_DO_MULTIPASS(multipass_flag);
--        pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
-         pd->stats_file = fopen(vob->divxlogfile, "r");
-         if (pd->stats_file == NULL){
-             tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
-@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
-         break;
-       case 3:
-         /* fixed qscale :p */
--        pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
-         pd->ff_venc_frame.quality = vob->divxbitrate;
-         break;
-     }
-@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->confdata.rc_buffer_size  = 0;
-     pd->confdata.lmin            = 2;
-     pd->confdata.lmax            = 31;
--    pd->confdata.me_method       = ME_EPZS;
-+    pd->confdata.me_method       = 0;
- 
-     memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
-     pd->confdata.turbo_setup = 0;
-@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.me_range                = 0;
-     pd->ff_vcontext.mb_decision             = 0;
-     pd->ff_vcontext.scenechange_threshold   = 0;
--    pd->ff_vcontext.scenechange_factor      = 1;
-+    pd->confdata.scenechange_factor         = 1;
-     pd->ff_vcontext.b_frame_strategy        = 0;
-     pd->ff_vcontext.b_sensitivity           = 40;
-     pd->ff_vcontext.brd_scale               = 0;
-     pd->ff_vcontext.bidir_refine            = 0;
--    pd->ff_vcontext.rc_strategy             = 2;
-+    pd->confdata.rc_strategy                = 2;
-     pd->ff_vcontext.b_quant_factor          = 1.25;
-     pd->ff_vcontext.i_quant_factor          = 0.8;
-     pd->ff_vcontext.b_quant_offset          = 1.25;
-@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.qblur                   = 0.5;
-     pd->ff_vcontext.qcompress               = 0.5;
-     pd->ff_vcontext.mpeg_quant              = 0;
--    pd->ff_vcontext.rc_initial_cplx         = 0.0;
--    pd->ff_vcontext.rc_qsquish              = 1.0;
-+    pd->confdata.rc_initial_cplx            = 0.0;
-+    pd->confdata.rc_qsquish              = 1.0;
-     pd->confdata.luma_elim_threshold     = 0;
-     pd->confdata.chroma_elim_threshold   = 0;
-     pd->ff_vcontext.strict_std_compliance   = 0;
-@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.temporal_cplx_masking   = 0.0;
-     pd->ff_vcontext.spatial_cplx_masking    = 0.0;
-     pd->ff_vcontext.p_masking               = 0.0;
--    pd->ff_vcontext.border_masking          = 0.0;
-+    pd->confdata.border_masking          = 0.0;
-     pd->ff_vcontext.me_pre_cmp              = 0;
-     pd->ff_vcontext.me_cmp                  = 0;
-     pd->ff_vcontext.me_sub_cmp              = 0;
-@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.pre_me                  = 1;
-     pd->ff_vcontext.me_subpel_quality       = 8;
-     pd->ff_vcontext.refs                    = 1;
--    pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
--    pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.noise_reduction         = 0;
-     pd->confdata.quantizer_noise_shaping = 0;
-     pd->ff_vcontext.flags                   = 0;
-@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa
-  */
- static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
- {
-+    char buf[1024];
-     /* some translation... */
-     pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 
1000;
-     pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
-     pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
-     pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
--    pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
--    pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
--    pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
-+    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin 
+ 0.5));
-+    av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
-+    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax 
+ 0.5));
-+    av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
- 
-     pd->ff_vcontext.flags = 0;
--    SET_FLAG(pd, mv0);
-     SET_FLAG(pd, qpel);
--    SET_FLAG(pd, naq);
-     SET_FLAG(pd, ilme);
-     SET_FLAG(pd, ildct);
-     SET_FLAG(pd, aic);
-@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
-     }
-     if (pd->interlacing.active) {
-         /* enforce interlacing */
--        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
--        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
-+        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
-     }
-     if (pd->confdata.flags.alt) {
-         av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
-@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
-     if (pd->confdata.flags.cbp) {
-       av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
-     }
-+    if (pd->confdata.flags.mv0) {
-+      av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
-+    }
-+    if (pd->confdata.flags.naq) {
-+      av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
-+    }
- 
--    char buf[1024];
- #define set_dict_opt(val, opt) \
-     snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
-     av_dict_set(&(pd->ff_opts), opt, buf, 0)
-+#define set_dict_float_opt(val, opt) \
-+    snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
-+    av_dict_set(&(pd->ff_opts), opt, buf, 0)
- 
-     set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
-     set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
-     set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
-+    set_dict_opt(inter_quant_bias, "pbias");
-+    set_dict_opt(intra_quant_bias, "ibias");
-+    set_dict_opt(me_method, "me_method");
-+    set_dict_opt(scenechange_factor, "sc_factor");
-+    set_dict_opt(rc_strategy, "rc_strategy");
-+    set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
-+    set_dict_float_opt(rc_qsquish, "qsquish");
-+    set_dict_float_opt(border_masking, "border_mask");
- }
- 
- #undef SET_FLAG
-@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
-         { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 
255.0 },
-         { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 
255.0 },
-         { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 
31 },
--        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
-+        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, INT_MAX },
-         { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
16, },
-         { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 16000 },
-         { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
3 },
-         { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -1000000, 1000000 },
--        { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 1, 16 },
-+        { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 1, 16 },
-         { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 10 },
-         { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 1, 100 },
-         { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 10 },
-@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
-         { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 24000000 },
-         { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 24000000 },
-         { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 4, 24000000 },
--        { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 2 },
-+        { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 2 },
-         { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0 },
-         { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0 },
-         { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 31.0 },
-@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri
-         { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         //  { "vrc_eq",     }, // not yet supported
-         { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
--        { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
-+        { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
-         //  { "vrc_init_occupancy",   }, // not yet supported
--        { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 99.0 },
-+        { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 99.0 },
-         { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -99, 99 },
-         { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -99, 99 },
-         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -99, 99 },
-@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
-         { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
-         { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
-         { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 
0.0, 1.0 },
--        { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
-+        { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
-         { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 4 },
-         { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000 },
-         { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 
},
-@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
-         { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
2000},
-         { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 8 },
-         { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
--        { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
--        { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
-+        { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
-+        { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
-         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 1000000},
-         { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 3 },
-         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 
0 },
-         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 
0 },
-     
--        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
-+        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
--        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL 
},
-+        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_QPEL },
-         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
--        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_INTERLACED_ME },
--        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_INTERLACED_DCT },
--        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_NORMALIZE_AQP },
-+        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_INTERLACED_ME },
-+        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_INTERLACED_DCT },
-+        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_H263P_AIC },
- #else        
--        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_AC_PRED },
-+        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_AC_PRED },
- #endif
-         { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
--        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR 
},
-+        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_PSNR },
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_TRELLIS_QUANT },
- #else
-         { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
- #endif
--        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY 
},
--        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV 
},
--        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_CLOSED_GOP },
-+        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_GRAY },
-+        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_4MV },
-+        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_CLOSED_GOP },
-     
-         //  { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // 
not yet  supported
-         /* End of the config file */
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -831,14 +831,11 @@ MOD_init
- 
-     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
-     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 
1000;
--    lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
--    lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
-     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
-     lavc_venc_context->qcompress          = lavc_param_vqcompress;
-     lavc_venc_context->qblur              = lavc_param_vqblur;
-     lavc_venc_context->max_b_frames       = lavc_param_vmax_b_frames;
-     lavc_venc_context->b_quant_factor     = lavc_param_vb_qfactor;
--    lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
-     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
-     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
- 
-@@ -846,8 +843,23 @@ MOD_init
- #define set_dict_opt(val, opt) \
-       snprintf(buf, sizeof(buf), "%i", val); \
-       av_dict_set(&lavc_venc_opts, opt, buf, 0)
-+#define set_dict_float_opt(val, opt) \
-+      snprintf(buf, sizeof(buf), "%f", val); \
-+      av_dict_set(&lavc_venc_opts, opt, buf, 0)
-     set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
-     set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
-+    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
-+    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
-+    set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
-+    set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
-+    set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
-+    set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
-+    set_dict_opt(lavc_param_rc_eq, "rc_eq");
-+    set_dict_opt(lavc_param_vme, "me_method");
-+    set_dict_opt(lavc_param_ibias, "ibias");
-+    set_dict_opt(lavc_param_pbias, "pbias");
-+    set_dict_float_opt(lavc_param_rc_buffer_aggressivity, 
"rc_buf_aggressivity");
-+    set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
-     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     if (lavc_param_packet_size)
-@@ -856,15 +868,9 @@ MOD_init
-     lavc_venc_context->strict_std_compliance= lavc_param_strict;
-     lavc_venc_context->i_quant_factor     = lavc_param_vi_qfactor;
-     lavc_venc_context->i_quant_offset     = lavc_param_vi_qoffset;
--    lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
--    lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
--    lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
--    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
-     lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
-     lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
-     lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 
1024;
--    lavc_venc_context->rc_buffer_aggressivity= 
lavc_param_rc_buffer_aggressivity;
--    lavc_venc_context->rc_initial_cplx    = lavc_param_rc_initial_cplx;
-     lavc_venc_context->debug              = lavc_param_debug;
-     lavc_venc_context->last_predictor_count= lavc_param_last_pred;
-     lavc_venc_context->pre_me             = lavc_param_pre_me;
-@@ -872,8 +878,6 @@ MOD_init
-     lavc_venc_context->pre_dia_size       = lavc_param_pre_dia_size;
-     lavc_venc_context->me_subpel_quality  = lavc_param_me_subpel_quality;
-     lavc_venc_context->me_range           = lavc_param_me_range;
--    lavc_venc_context->intra_quant_bias   = lavc_param_ibias;
--    lavc_venc_context->inter_quant_bias   = lavc_param_pbias;
-     lavc_venc_context->coder_type         = lavc_param_coder;
-     lavc_venc_context->context_model      = lavc_param_context;
-     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-@@ -1079,6 +1083,8 @@ MOD_init
-     lavc_venc_context->flags |= lavc_param_mv0;
-     if(lavc_param_qp_rd)
-       av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
-+    if (lavc_param_normalize_aqp)
-+      av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
-     lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     lavc_venc_context->flags |= lavc_param_trell;
-@@ -1087,9 +1093,7 @@ MOD_init
- #endif
- 
-     if (lavc_param_gray)
--        lavc_venc_context->flags |= CODEC_FLAG_GRAY;
--    if (lavc_param_normalize_aqp)
--        lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
-+        lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
- 
-     switch(vob->encode_fields) {
-     case TC_ENCODE_FIELDS_TOP_FIRST:
-@@ -1107,9 +1111,9 @@ MOD_init
-     }
- 
-     lavc_venc_context->flags |= interlacing_active ?
--        CODEC_FLAG_INTERLACED_DCT : 0;
-+        AV_CODEC_FLAG_INTERLACED_DCT : 0;
-     lavc_venc_context->flags |= interlacing_active ?
--        CODEC_FLAG_INTERLACED_ME : 0;
-+        AV_CODEC_FLAG_INTERLACED_ME : 0;
- 
-     lavc_venc_context->flags |= lavc_param_psnr;
-     do_psnr = lavc_param_psnr;
-@@ -1156,7 +1160,7 @@ MOD_init
-                   "encoding.");
-           return TC_EXPORT_ERROR;
-         }
--        lavc_venc_context->flags |= CODEC_FLAG_PASS1;
-+        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
-         stats_file = fopen(vob->divxlogfile, "w");
-         if (stats_file == NULL){
-           tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
-@@ -1170,7 +1174,7 @@ MOD_init
-                   "encoding.");
-           return TC_EXPORT_ERROR;
-         }
--        lavc_venc_context->flags |= CODEC_FLAG_PASS2;
-+        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
-         stats_file= fopen(vob->divxlogfile, "r");
-         if (stats_file==NULL){
-           tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
-@@ -1201,12 +1205,11 @@ MOD_init
-         break;
-       case 3:
-         /* fixed qscale :p */
--        lavc_venc_context->flags   |= CODEC_FLAG_QSCALE;
-+        lavc_venc_context->flags   |= AV_CODEC_FLAG_QSCALE;
-         lavc_venc_frame->quality  = vob->divxbitrate;
-         break;
-     }
- 
--    lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
- 
-       /* FIXME: transcode itself contains "broken ffmpeg default settings", 
thus we need to override them! */
-       if (lavc_param_video_preset && strcmp(lavc_param_video_preset, 
"none")) {
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
- int lavc_param_pre_me= 1;
- int lavc_param_me_subpel_quality= 8;
- int lavc_param_me_range=0;
--int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
--int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
-+int lavc_param_ibias=0;
-+int lavc_param_pbias=0;
- int lavc_param_coder=0;
- int lavc_param_context=0;
- char *lavc_param_intra_matrix = NULL;
-@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 4, 24000000},
-     {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
9},
--    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
-+    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
-     {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
- //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
1, 31},
- //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 
31},
-@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0},
-     {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 
0.0, 1.0},
-     {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0},
--    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
-+    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, INT_MAX},
- //    {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
2},
-     {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 2},
-     {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 10},
-@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
-99, 99},
-     {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
-+    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
-     {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 20},
-     {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
100000000},
--    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
-+    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
-     {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000},
-     {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
2000},
-     {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000},
-@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
-     {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000},
-     {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -2000, 2000},
-     {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
-2000, 2000},
--    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
-+    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
--    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_TRELLIS_QUANT},
-+    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_TRELLIS_QUANT},
- #else
-     {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
- #endif
-@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
-     {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 8},
-     {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 16000},
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
--    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
-+    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_H263P_AIC},
- #else
--    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
-+    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
- #endif    
-     {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 
512},
-@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
-     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
--    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
-+    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 
16},
-     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
--    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_INTERLACED_ME},
-+    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_INTERLACED_ME},
-     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
--    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
--    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_TRUNCATED},
--    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_CLOSED_GOP},
-+    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
-+    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_TRUNCATED},
-+    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_CLOSED_GOP},
-     {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 16},
-     {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 1000},
-     {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 1000},
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -361,7 +361,7 @@ do_avi:
-     lavc_dec_context->width  = x_dim;
-     lavc_dec_context->height = y_dim;
- 
--    if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
-+    if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
diff --git a/video/transcode/transcode-1.1.7-ffmpeg-0.10.patch 
b/video/transcode/transcode-1.1.7-ffmpeg-0.10.patch
deleted file mode 100644
index ea737c8..0000000
--- a/video/transcode/transcode-1.1.7-ffmpeg-0.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/401287
-
---- filter/filter_pp.c
-+++ 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/video/transcode/transcode-1.1.7-ffmpeg-0.11.patch 
b/video/transcode/transcode-1.1.7-ffmpeg-0.11.patch
deleted file mode 100644
index 871d073..0000000
--- a/video/transcode/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/video/transcode/transcode-1.1.7-ffmpeg.patch 
b/video/transcode/transcode-1.1.7-ffmpeg.patch
deleted file mode 100644
index be7a6cb..0000000
--- a/video/transcode/transcode-1.1.7-ffmpeg.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- encode/encode_lavc.c
-+++ 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 },
---- export/ffmpeg_cfg.c
-+++ 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},
---- export/ffmpeg_cfg.h
-+++ 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/video/transcode/transcode-1.1.7-ffmpeg2.patch 
b/video/transcode/transcode-1.1.7-ffmpeg2.patch
deleted file mode 100644
index 26d7431..0000000
--- a/video/transcode/transcode-1.1.7-ffmpeg2.patch
+++ /dev/null
@@ -1,332 +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
-@@ -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 !",
-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
-@@ -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;
-@@ -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.",
diff --git a/video/transcode/transcode-1.1.7-freetype251.patch 
b/video/transcode/transcode-1.1.7-freetype251.patch
deleted file mode 100644
index 59c6ab3..0000000
--- a/video/transcode/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/video/transcode/transcode-1.1.7-libav-9.patch 
b/video/transcode/transcode-1.1.7-libav-9.patch
deleted file mode 100644
index 9f2d235..0000000
--- a/video/transcode/transcode-1.1.7-libav-9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./import/probe_ffmpeg.c.original   2013-04-22 20:04:51.058081388 +0200
-+++ ./import/probe_ffmpeg.c    2013-04-22 20:05:25.744081897 +0200
-@@ -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)",
---- ./import/decode_lavc.c.original    2013-04-22 20:06:17.260082652 +0200
-+++ ./import/decode_lavc.c     2013-04-22 20:07:47.564083975 +0200
-@@ -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/video/transcode/transcode-1.1.7-preset-force.patch 
b/video/transcode/transcode-1.1.7-preset-force.patch
deleted file mode 100644
index 0d1da8b..0000000
--- a/video/transcode/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/video/transcode/transcode-1.1.7-preset-free.patch 
b/video/transcode/transcode-1.1.7-preset-free.patch
deleted file mode 100644
index 00494b9..0000000
--- a/video/transcode/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/video/transcode/transcode-ffmpeg3.patch 
b/video/transcode/transcode-ffmpeg3.patch
new file mode 100644
index 0000000..869a9eb
--- /dev/null
+++ b/video/transcode/transcode-ffmpeg3.patch
@@ -0,0 +1,1241 @@
+Submitted By:            Armion K. <krejzi at email dot com>
+Date:                    2016-05-06
+Initial Package Version: 1.1.7
+Upstream Status:         Unknown
+Origin:                  Gentoo and Debian
+Description:             Fixes building against FFmpeg version >= 3.0.0
+
+--- a/encode/encode_lavc.c     2011-11-19 17:50:27.000000000 +0100
++++ b/encode/encode_lavc.c     2016-02-15 16:08:37.914488116 +0100
+@@ -74,6 +74,9 @@
+     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,6 +117,7 @@
+ 
+     AVFrame ff_venc_frame;
+     AVCodecContext ff_vcontext;
++    AVDictionary * ff_opts;
+ 
+     AVCodec *ff_vcodec;
+ 
+@@ -164,6 +168,7 @@
+     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,
+@@ -176,6 +181,20 @@
+     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 };
+ 
+@@ -214,7 +233,7 @@
+                                      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);
+ }
+ 
+@@ -228,7 +247,7 @@
+                     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,
+@@ -244,7 +263,7 @@
+                     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,
+@@ -256,7 +275,7 @@
+                                              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);
+ 
+ }
+@@ -266,7 +285,7 @@
+                                    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,
+@@ -591,21 +610,21 @@
+       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 {
+@@ -615,10 +634,10 @@
+       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:
+@@ -937,7 +956,11 @@
+ 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;
+ 
+@@ -955,8 +978,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;
+@@ -977,8 +998,8 @@
+     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;
+@@ -1002,7 +1023,7 @@
+     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,17 +1054,10 @@
+     pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
+ 
+     pd->ff_vcontext.flags = 0;
+-    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 +1078,36 @@
+         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);
++    }
++    if (pd->confdata.flags.cbp) {
++      av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
++    }
++    if (pd->confdata.flags.mv0) {
++        av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
++    }
++    if (pd->confdata.flags.naq) {
++        av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
++    }
++
++    char buf[1024];
++#define set_dict_opt(val, opt) \
++    snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
++    av_dict_set(&(pd->ff_opts), opt, buf, 0)
++
++    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
+@@ -1116,12 +1160,10 @@
+         //  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 },
+-        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
++        { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, INT_MAX },
+         { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
16, },
+         { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 16000 },
+         { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
3 },
+@@ -1150,8 +1192,8 @@
+         { "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 
},
+@@ -1177,25 +1219,25 @@
+         { "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 
},
++        { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
++        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL 
},
+-        { "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 },
++        { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
++        { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_H263P_AIC },
+ #else        
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_AC_PRED },
+ #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 },
+@@ -1345,12 +1387,14 @@
+ 
+     pd = self->userdata;
+ 
++    pd->ff_opts = NULL;
++
+     pd->flush_flag = vob->encoder_flush;
+     
+     /* 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
+@@ -1387,7 +1431,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 +1441,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 */
+@@ -1483,6 +1527,8 @@
+                                 vframe_list_t *outframe)
+ {
+     TCLavcPrivateData *pd = NULL;
++    AVPacket pkt;
++    int ret, got_packet = 0;
+ 
+     TC_MODULE_SELF_CHECK(self, "encode_video");
+ 
+@@ -1497,12 +1543,15 @@
+ 
+     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)",
+--- a/export/aud_aux.c 2011-11-19 17:50:27.000000000 +0100
++++ b/export/aud_aux.c 2016-02-15 16:08:37.914488116 +0100
+@@ -326,10 +326,10 @@
+ 
+     switch (o_codec) {
+       case   0x50:
+-        codeid = CODEC_ID_MP2;
++        codeid = AV_CODEC_ID_MP2;
+         break;
+       case 0x2000:
+-        codeid = CODEC_ID_AC3;
++        codeid = AV_CODEC_ID_AC3;
+         break;
+       default:
+         tc_warn("cannot init ffmpeg with %x", o_codec);
+@@ -346,7 +346,7 @@
+ 
+     //-- 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,11 +359,11 @@
+     //-- 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 !",
+-                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
++                (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3");
+         return(TC_EXPORT_ERROR);
+     }
+ 
+@@ -846,6 +846,9 @@
+ #ifdef HAVE_FFMPEG
+     int  in_size, out_size;
+     char *in_buf;
++    int got_packet;
++    AVPacket avpkt = { 0 };
++    AVFrame *frame = av_frame_alloc();
+ 
+     //-- input buffer and amount of bytes --
+     in_size = aud_size;
+@@ -866,10 +869,14 @@
+ 
+     ac_memcpy(&mpa_buf[mpa_buf_ptr], in_buf, bytes_needed);
+ 
++    frame->nb_samples = mpa_ctx.frame_size;
++    avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, 
(const uint8_t *)mpa_buf, mpa_bytes_pf, 1);
++    avpkt.data = output;
++    avpkt.size = OUTPUT_SIZE;
+     TC_LOCK_LIBAVCODEC;
+-    out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
+-                    OUTPUT_SIZE, (short *)mpa_buf);
++    out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, &got_packet);
+     TC_UNLOCK_LIBAVCODEC;
++    out_size = avpkt.size;
+     tc_audio_write(output, out_size, avifile);
+ 
+         in_size -= bytes_needed;
+@@ -884,6 +891,7 @@
+ 
+     ac_memcpy(&mpa_buf[mpa_buf_ptr], aud_buffer, bytes_avail);
+         mpa_buf_ptr += bytes_avail;
++        av_frame_free(&frame);
+         return (0);
+       }
+     } //bytes availabe from last call?
+@@ -893,10 +901,15 @@
+     //----------------------------------------------------
+ 
+     while (in_size >= mpa_bytes_pf) {
++      av_frame_unref(frame);
++      frame->nb_samples = mpa_ctx.frame_size;
++      avcodec_fill_audio_frame(frame, mpa_ctx.channels, mpa_ctx.sample_fmt, 
(const uint8_t *)in_buf, mpa_bytes_pf, 1);
++      avpkt.data = output;
++      avpkt.size = OUTPUT_SIZE;
+       TC_LOCK_LIBAVCODEC;
+-      out_size = avcodec_encode_audio(&mpa_ctx, (unsigned char *)output,
+-                      OUTPUT_SIZE, (short *)in_buf);
++      out_size = avcodec_encode_audio2(&mpa_ctx, &avpkt, frame, 
&got_packet);
+       TC_UNLOCK_LIBAVCODEC;
++      out_size = avpkt.size;
+ 
+       tc_audio_write(output, out_size, avifile);
+ 
+@@ -904,6 +917,8 @@
+       in_buf  += mpa_bytes_pf;
+     }
+ 
++    av_frame_free(&frame);
++
+     //-- hold rest of bytes in mpa-buffer --
+     //--------------------------------------
+     if (in_size > 0) {
+--- a/export/export_ffmpeg.c   2011-11-19 17:50:27.000000000 +0100
++++ b/export/export_ffmpeg.c   2016-02-15 16:08:37.915488139 +0100
+@@ -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>
+ 
+@@ -249,9 +250,9 @@
+     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 */
+               }
+     }
+@@ -266,7 +267,10 @@
+         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);
+@@ -470,7 +474,6 @@
+     }
+ 
+     TC_LOCK_LIBAVCODEC;
+-    avcodec_init();
+     avcodec_register_all();
+     TC_UNLOCK_LIBAVCODEC;
+ 
+@@ -486,11 +489,11 @@
+                           codec->name, codec->fourCC, codec->comments);
+     }
+ 
+-    lavc_venc_context = avcodec_alloc_context();
+-    lavc_venc_frame   = avcodec_alloc_frame();
++    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
++    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) {
+@@ -634,7 +637,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 +677,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;
+ 
+@@ -838,8 +841,13 @@
+     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 +878,7 @@
+     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;
+@@ -887,7 +895,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;
+@@ -1061,19 +1069,18 @@
+     lavc_venc_context->ildct_cmp  = lavc_param_ildct_cmp;
+     lavc_venc_context->dia_size   = lavc_param_dia_size;
+     lavc_venc_context->flags |= lavc_param_qpel;
+-    lavc_venc_context->flags |= lavc_param_gmc;
++    if(lavc_param_gmc)
++        av_dict_set(&lavc_venc_opts, "gmc", "1", 0);
+     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;
++    if(lavc_param_cbp)
++      av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
++    if(lavc_param_mv0)
++        av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0);
++    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;
+@@ -1084,7 +1091,7 @@
+     if (lavc_param_gray)
+         lavc_venc_context->flags |= CODEC_FLAG_GRAY;
+     if (lavc_param_normalize_aqp)
+-        lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
++        av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
+ 
+     switch(vob->encode_fields) {
+     case TC_ENCODE_FIELDS_TOP_FIRST:
+@@ -1112,7 +1119,7 @@
+     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)
+@@ -1121,18 +1128,18 @@
+             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;
+             }
+ 
+@@ -1203,9 +1210,8 @@
+ 
+     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 = ffmpeg_codec_name(codec->name);
+ 
+@@ -1241,20 +1247,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;
+     }
+ 
+@@ -1574,6 +1599,8 @@
+ 
+   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) {
+ 
+@@ -1598,7 +1625,7 @@
+                       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,
+@@ -1628,7 +1655,7 @@
+                                               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,
+@@ -1639,7 +1666,7 @@
+ 
+         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,
+@@ -1652,13 +1679,17 @@
+               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;
+--- a/export/ffmpeg_cfg.c      2011-11-19 17:50:27.000000000 +0100
++++ b/export/ffmpeg_cfg.c      2016-02-15 16:08:37.916488161 +0100
+@@ -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;
+@@ -126,7 +124,7 @@
+ //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[]={
+@@ -143,15 +141,13 @@
+ //    {"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},
+     {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0},
+     {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 
0.0, 1.0},
+     {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0},
+-    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
++    {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, INT_MAX},
+ //    {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
2},
+     {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 2},
+     {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 10},
+@@ -160,9 +156,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,26 +207,26 @@
+ #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},
+     {"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},
+-    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
++    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
++    {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 1000000},
+-    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 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, 
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},
+     {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
+-    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
++    {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_TRUNCATED},
+     {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_CLOSED_GOP},
+     {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 16},
+--- a/export/ffmpeg_cfg.h      2011-11-19 17:50:27.000000000 +0100
++++ b/export/ffmpeg_cfg.h      2016-02-15 16:08:37.916488161 +0100
+@@ -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;
+--- a/filter/filter_pp.c       2011-11-19 17:50:27.000000000 +0100
++++ b/filter/filter_pp.c       2016-02-15 16:08:37.916488161 +0100
+@@ -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];
+ 
+--- a/import/decode_lavc.c     2011-11-19 17:50:27.000000000 +0100
++++ b/import/decode_lavc.c     2016-02-15 16:09:00.252988897 +0100
+@@ -58,37 +58,37 @@
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+-  {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+-  {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
+     {"MP42", "DIV2", ""}},
+-  {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
+     {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
+-  {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
+     {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
+-  {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
+     {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
+-  {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
+     {"MPG1", ""}},
+-  {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
+     {"DVSD", ""}},
+-  {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
+     {"WMV1", ""}},
+-  {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
+     {"WMV2", ""}},
+-  {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
+     {"HFYU", ""}},
+-  {CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
+     {"I263", ""}},
+-  {CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
+     {"H263", "U263", "VIV1", ""}},
+-  {CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
+     {"RV10", "RV13", ""}},
+-  {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
+     {"SVQ1", ""}},
+-  {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
+     {"SVQ3", ""}},
+-  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
+     {"MPG2", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
+ 
+@@ -170,7 +170,7 @@
+ 
+   // 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;
+@@ -181,12 +181,12 @@
+ #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;
+ 
+-  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;
+@@ -290,8 +290,8 @@
+ 
+       // 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;
+@@ -315,7 +315,7 @@
+                         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++) {
+@@ -334,8 +334,8 @@
+                         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++) {
+@@ -354,8 +354,8 @@
+                         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++) {
+--- a/import/import_ffmpeg.c   2011-11-19 17:50:27.000000000 +0100
++++ b/import/import_ffmpeg.c   2016-02-15 16:08:48.269720627 +0100
+@@ -59,51 +59,51 @@
+ 
+ // fourCC to ID mapping taken from MPlayer's codecs.conf
+ static struct ffmpeg_codec ffmpeg_codecs[] = {
+-  {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
++  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
+     {"MP41", "DIV1", ""}},
+-  {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
++  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
+     {"MP42", "DIV2", ""}},
+-  {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
++  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
+     {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
+-  {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
++  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
+     {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
+-  {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
++  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
+     {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
+-  {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
++  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
+     {"MPG1", ""}},
+-  {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
++  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
+     {"DVSD", ""}},
+-  {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
++  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
+     {"WMV1", ""}},
+-  {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
++  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
+     {"WMV2", ""}},
+-  {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
++  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
+     {"HFYU", ""}},
+-  {CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
++  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
+     {"I263", ""}},
+-  {CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
++  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
+     {"H263", "U263", "VIV1", ""}},
+-  {CODEC_ID_H264, TC_CODEC_H264, "h264",
++  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
+     {"H264", "h264", "X264", "x264", "avc1", ""}},
+-  {CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
++  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
+     {"RV10", "RV13", ""}},
+-  {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
++  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
+     {"SVQ1", ""}},
+-  {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
++  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
+     {"SVQ3", ""}},
+-  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
+     {"MPG2", ""}},
+-  {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
++  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
+     {"MPG2", ""}},
+-  {CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
++  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
+     {"ASV1", ""}},
+-  {CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
++  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
+     {"ASV2", ""}},
+-  {CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
++  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
+     {"FFV1", ""}},
+-  {CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
+     {"I420", "IYUV", ""}},
+-  {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
++  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
+     {"Y42B", ""}},
+   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
+ 
+@@ -302,7 +302,7 @@
+ 
+     // 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;
+@@ -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;
+@@ -324,13 +324,13 @@
+     // XXX: some codecs need extra data
+     switch (codec->id)
+     {
+-      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;
+-      case CODEC_ID_ASV1: extra_data_size = 8; break;
+-      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;
++      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;
+       default: extra_data_size = 0; break;
+     }
+ 
+@@ -344,7 +344,7 @@
+     }
+ 
+     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 +360,7 @@
+         frame_size = x_dim*y_dim + 
2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
+ 
+       // we adapt the color space
+-        if(codec->id == CODEC_ID_MJPEG) {
++        if(codec->id == AV_CODEC_ID_MJPEG) {
+         enable_levels_filter();
+         }
+         break;
+@@ -434,7 +434,7 @@
+       }
+ 
+       // we adapt the color space
+-      if(codec->id == CODEC_ID_MJPEG) {
++      if(codec->id == AV_CODEC_ID_MJPEG) {
+         enable_levels_filter();
+       }
+ 
+@@ -504,13 +504,13 @@
+       int bkey = 0;
+ 
+       // check for keyframes
+-      if (codec->id == CODEC_ID_MSMPEG4V3) {
++      if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
+       if (divx3_is_key(buffer)) bkey = 1;
+       }
+-      else if (codec->id == CODEC_ID_MPEG4) {
++      else if (codec->id == AV_CODEC_ID_MPEG4) {
+       if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
+       }
+-      else if (codec->id == CODEC_ID_MJPEG) {
++      else if (codec->id == AV_CODEC_ID_MJPEG) {
+       bkey = 1;
+       }
+ 
+@@ -580,8 +580,8 @@
+ 
+     // 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);
+@@ -612,7 +612,7 @@
+       }
+         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);
+@@ -640,8 +640,8 @@
+         }
+         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);
+@@ -669,8 +669,8 @@
+         }
+       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);
+--- a/import/probe_ffmpeg.c    2011-11-19 17:50:27.000000000 +0100
++++ b/import/probe_ffmpeg.c    2016-02-15 16:08:37.917488184 +0100
+@@ -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)",
+@@ -109,7 +109,7 @@
+         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)",
+@@ -120,7 +120,11 @@
+ 
+     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;
+ }
+ 
+--- a/libtc/tcavcodec.h        2011-11-19 17:50:27.000000000 +0100
++++ b/libtc/tcavcodec.h        2016-02-15 16:08:37.917488184 +0100
+@@ -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/video/transcode/transcode-ffmpeg4.patch 
b/video/transcode/transcode-ffmpeg4.patch
new file mode 100644
index 0000000..e602621
--- /dev/null
+++ b/video/transcode/transcode-ffmpeg4.patch
@@ -0,0 +1,494 @@
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
+@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
+     int luma_elim_threshold;
+     int chroma_elim_threshold;
+     int quantizer_noise_shaping;
++    int inter_quant_bias;
++    int intra_quant_bias;
++    int scenechange_factor;
++    int rc_strategy;
++    float rc_initial_cplx;
++    float rc_qsquish;
++    float border_masking;
+ 
+     /* same as above for flags */
+     struct {
+@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
+     switch (vob->divxmultipass) {
+       case 1:
+         CAN_DO_MULTIPASS(multipass_flag);
+-        pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
+         pd->stats_file = fopen(vob->divxlogfile, "w");
+         if (pd->stats_file == NULL) {
+             tc_log_error(MOD_NAME, "could not create 2pass log file"
+@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
+         break;
+       case 2:
+         CAN_DO_MULTIPASS(multipass_flag);
+-        pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
+         pd->stats_file = fopen(vob->divxlogfile, "r");
+         if (pd->stats_file == NULL){
+             tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
+@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
+         break;
+       case 3:
+         /* fixed qscale :p */
+-        pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
+         pd->ff_venc_frame.quality = vob->divxbitrate;
+         break;
+     }
+@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
+     pd->confdata.rc_buffer_size  = 0;
+     pd->confdata.lmin            = 2;
+     pd->confdata.lmax            = 31;
+-    pd->confdata.me_method       = ME_EPZS;
++    pd->confdata.me_method       = 0;
+ 
+     memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
+     pd->confdata.turbo_setup = 0;
+@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.me_range                = 0;
+     pd->ff_vcontext.mb_decision             = 0;
+     pd->ff_vcontext.scenechange_threshold   = 0;
+-    pd->ff_vcontext.scenechange_factor      = 1;
++    pd->confdata.scenechange_factor         = 1;
+     pd->ff_vcontext.b_frame_strategy        = 0;
+     pd->ff_vcontext.b_sensitivity           = 40;
+     pd->ff_vcontext.brd_scale               = 0;
+     pd->ff_vcontext.bidir_refine            = 0;
+-    pd->ff_vcontext.rc_strategy             = 2;
++    pd->confdata.rc_strategy                = 2;
+     pd->ff_vcontext.b_quant_factor          = 1.25;
+     pd->ff_vcontext.i_quant_factor          = 0.8;
+     pd->ff_vcontext.b_quant_offset          = 1.25;
+@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.qblur                   = 0.5;
+     pd->ff_vcontext.qcompress               = 0.5;
+     pd->ff_vcontext.mpeg_quant              = 0;
+-    pd->ff_vcontext.rc_initial_cplx         = 0.0;
+-    pd->ff_vcontext.rc_qsquish              = 1.0;
++    pd->confdata.rc_initial_cplx            = 0.0;
++    pd->confdata.rc_qsquish              = 1.0;
+     pd->confdata.luma_elim_threshold     = 0;
+     pd->confdata.chroma_elim_threshold   = 0;
+     pd->ff_vcontext.strict_std_compliance   = 0;
+@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.temporal_cplx_masking   = 0.0;
+     pd->ff_vcontext.spatial_cplx_masking    = 0.0;
+     pd->ff_vcontext.p_masking               = 0.0;
+-    pd->ff_vcontext.border_masking          = 0.0;
++    pd->confdata.border_masking          = 0.0;
+     pd->ff_vcontext.me_pre_cmp              = 0;
+     pd->ff_vcontext.me_cmp                  = 0;
+     pd->ff_vcontext.me_sub_cmp              = 0;
+@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
+     pd->ff_vcontext.pre_me                  = 1;
+     pd->ff_vcontext.me_subpel_quality       = 8;
+     pd->ff_vcontext.refs                    = 1;
+-    pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+-    pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
+     pd->ff_vcontext.noise_reduction         = 0;
+     pd->confdata.quantizer_noise_shaping = 0;
+     pd->ff_vcontext.flags                   = 0;
+@@ -1044,14 +1049,16 @@ static void tc_lavc_config_defaults(TCLa
+  */
+ static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
+ {
++    char buf[1024];
+     /* some translation... */
+     pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 
1000;
+     pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
+     pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
+     pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
+-    pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
+-    pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
+-    pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
++    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin 
+ 0.5));
++    av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
++    snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax 
+ 0.5));
++    av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
+ 
+     pd->ff_vcontext.flags = 0;
+     SET_FLAG(pd, qpel);
+@@ -1075,8 +1080,8 @@ static void tc_lavc_dispatch_settings(TC
+     }
+     if (pd->interlacing.active) {
+         /* enforce interlacing */
+-        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+-        pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
++        pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
+     }
+     if (pd->confdata.flags.alt) {
+         av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+@@ -1100,14 +1105,24 @@ static void tc_lavc_dispatch_settings(TC
+         av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
+     }
+ 
+-    char buf[1024];
+ #define set_dict_opt(val, opt) \
+     snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
+     av_dict_set(&(pd->ff_opts), opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++    snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
++    av_dict_set(&(pd->ff_opts), opt, buf, 0)
+ 
+     set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
+     set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
+     set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
++    set_dict_opt(inter_quant_bias, "pbias");
++    set_dict_opt(intra_quant_bias, "ibias");
++    set_dict_opt(me_method, "me_method");
++    set_dict_opt(scenechange_factor, "sc_factor");
++    set_dict_opt(rc_strategy, "rc_strategy");
++    set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
++    set_dict_float_opt(rc_qsquish, "qsquish");
++    set_dict_float_opt(border_masking, "border_mask");
+ }
+ 
+ #undef SET_FLAG
+@@ -1168,7 +1189,7 @@ static int tc_lavc_read_config(TCLavcPri
+         { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 16000 },
+         { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
3 },
+         { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -1000000, 1000000 },
+-        { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 1, 16 },
++        { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 1, 16 },
+         { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 10 },
+         { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 1, 100 },
+         { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 10 },
+@@ -1179,7 +1200,7 @@ static int tc_lavc_read_config(TCLavcPri
+         { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 24000000 },
+         { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 24000000 },
+         { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 4, 24000000 },
+-        { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 2 },
++        { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 2 },
+         { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0 },
+         { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0 },
+         { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 31.0 },
+@@ -1189,9 +1210,9 @@ static int tc_lavc_read_config(TCLavcPri
+         { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         //  { "vrc_eq",     }, // not yet supported
+         { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
+-        { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
++        { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+         //  { "vrc_init_occupancy",   }, // not yet supported
+-        { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 99.0 },
++        { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 99.0 },
+         { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -99, 99 },
+         { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -99, 99 },
+         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -99, 99 },
+@@ -1203,7 +1224,7 @@ static int tc_lavc_read_config(TCLavcPri
+         { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
+         { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
+         { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 
0.0, 1.0 },
+-        { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
++        { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 1.0 },
+         { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 4 },
+         { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000 },
+         { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 
},
+@@ -1216,37 +1237,37 @@ static int tc_lavc_read_config(TCLavcPri
+         { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
2000},
+         { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 8 },
+         { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
+-        { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
+-        { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
++        { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
++        { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -512, 512 },
+         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 1000000},
+         { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 3 },
+         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 
0 },
+         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 
0 },
+     
+         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL 
},
++        { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_QPEL },
+         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_INTERLACED_ME },
+-        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_INTERLACED_DCT },
++        { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_INTERLACED_ME },
++        { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_INTERLACED_DCT },
+         { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_H263P_AIC },
+ #else        
+-        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_AC_PRED },
++        { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_AC_PRED },
+ #endif
+         { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+         { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+-        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR 
},
++        { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_PSNR },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+         { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_TRELLIS_QUANT },
+ #else
+         { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #endif
+-        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY 
},
+-        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV 
},
+-        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_CLOSED_GOP },
++        { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_GRAY },
++        { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_4MV },
++        { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_CLOSED_GOP },
+     
+         //  { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // 
not yet  supported
+         /* End of the config file */
+--- a/export/export_ffmpeg.c
++++ b/export/export_ffmpeg.c
+@@ -831,14 +831,11 @@ MOD_init
+ 
+     lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
+     lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 
1000;
+-    lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
+-    lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
+     lavc_venc_context->max_qdiff          = lavc_param_vqdiff;
+     lavc_venc_context->qcompress          = lavc_param_vqcompress;
+     lavc_venc_context->qblur              = lavc_param_vqblur;
+     lavc_venc_context->max_b_frames       = lavc_param_vmax_b_frames;
+     lavc_venc_context->b_quant_factor     = lavc_param_vb_qfactor;
+-    lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
+     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
+     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
+ 
+@@ -846,8 +843,23 @@ MOD_init
+ #define set_dict_opt(val, opt) \
+       snprintf(buf, sizeof(buf), "%i", val); \
+       av_dict_set(&lavc_venc_opts, opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++      snprintf(buf, sizeof(buf), "%f", val); \
++      av_dict_set(&lavc_venc_opts, opt, buf, 0)
+     set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
+     set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
++    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
++    set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
++    set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
++    set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
++    set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
++    set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
++    set_dict_opt(lavc_param_rc_eq, "rc_eq");
++    set_dict_opt(lavc_param_vme, "me_method");
++    set_dict_opt(lavc_param_ibias, "ibias");
++    set_dict_opt(lavc_param_pbias, "pbias");
++    set_dict_float_opt(lavc_param_rc_buffer_aggressivity, 
"rc_buf_aggressivity");
++    set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
+     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     if (lavc_param_packet_size)
+@@ -856,15 +868,9 @@ MOD_init
+     lavc_venc_context->strict_std_compliance= lavc_param_strict;
+     lavc_venc_context->i_quant_factor     = lavc_param_vi_qfactor;
+     lavc_venc_context->i_quant_offset     = lavc_param_vi_qoffset;
+-    lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
+-    lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
+-    lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
+-    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
+     lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
+     lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
+     lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 
1024;
+-    lavc_venc_context->rc_buffer_aggressivity= 
lavc_param_rc_buffer_aggressivity;
+-    lavc_venc_context->rc_initial_cplx    = lavc_param_rc_initial_cplx;
+     lavc_venc_context->debug              = lavc_param_debug;
+     lavc_venc_context->last_predictor_count= lavc_param_last_pred;
+     lavc_venc_context->pre_me             = lavc_param_pre_me;
+@@ -872,8 +878,6 @@ MOD_init
+     lavc_venc_context->pre_dia_size       = lavc_param_pre_dia_size;
+     lavc_venc_context->me_subpel_quality  = lavc_param_me_subpel_quality;
+     lavc_venc_context->me_range           = lavc_param_me_range;
+-    lavc_venc_context->intra_quant_bias   = lavc_param_ibias;
+-    lavc_venc_context->inter_quant_bias   = lavc_param_pbias;
+     lavc_venc_context->coder_type         = lavc_param_coder;
+     lavc_venc_context->context_model      = lavc_param_context;
+     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+@@ -1081,6 +1085,8 @@ MOD_init
+         av_dict_set(&lavc_venc_opts, "mpv_flags", "+mv0", 0);
+     if(lavc_param_qp_rd)
+       av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
++    if (lavc_param_normalize_aqp)
++      av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
+     lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+     lavc_venc_context->flags |= lavc_param_trell;
+@@ -1089,9 +1095,7 @@ MOD_init
+ #endif
+ 
+     if (lavc_param_gray)
+-        lavc_venc_context->flags |= CODEC_FLAG_GRAY;
+-    if (lavc_param_normalize_aqp)
+-        av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
++        lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
+ 
+     switch(vob->encode_fields) {
+     case TC_ENCODE_FIELDS_TOP_FIRST:
+@@ -1109,9 +1113,9 @@ MOD_init
+     }
+ 
+     lavc_venc_context->flags |= interlacing_active ?
+-        CODEC_FLAG_INTERLACED_DCT : 0;
++        AV_CODEC_FLAG_INTERLACED_DCT : 0;
+     lavc_venc_context->flags |= interlacing_active ?
+-        CODEC_FLAG_INTERLACED_ME : 0;
++        AV_CODEC_FLAG_INTERLACED_ME : 0;
+ 
+     lavc_venc_context->flags |= lavc_param_psnr;
+     do_psnr = lavc_param_psnr;
+@@ -1158,7 +1162,7 @@ MOD_init
+                   "encoding.");
+           return TC_EXPORT_ERROR;
+         }
+-        lavc_venc_context->flags |= CODEC_FLAG_PASS1;
++        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
+         stats_file = fopen(vob->divxlogfile, "w");
+         if (stats_file == NULL){
+           tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
+@@ -1172,7 +1176,7 @@ MOD_init
+                   "encoding.");
+           return TC_EXPORT_ERROR;
+         }
+-        lavc_venc_context->flags |= CODEC_FLAG_PASS2;
++        lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
+         stats_file= fopen(vob->divxlogfile, "r");
+         if (stats_file==NULL){
+           tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
+@@ -1203,12 +1207,11 @@ MOD_init
+         break;
+       case 3:
+         /* fixed qscale :p */
+-        lavc_venc_context->flags   |= CODEC_FLAG_QSCALE;
++        lavc_venc_context->flags   |= AV_CODEC_FLAG_QSCALE;
+         lavc_venc_frame->quality  = vob->divxbitrate;
+         break;
+     }
+ 
+-    lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+ 
+       /* FIXME: transcode itself contains "broken ffmpeg default settings", 
thus we need to override them! */
+       if (lavc_param_video_preset && strcmp(lavc_param_video_preset, 
"none")) {
+--- a/export/ffmpeg_cfg.c
++++ b/export/ffmpeg_cfg.c
+@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
+ int lavc_param_pre_me= 1;
+ int lavc_param_me_subpel_quality= 8;
+ int lavc_param_me_range=0;
+-int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
+-int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
++int lavc_param_ibias=0;
++int lavc_param_pbias=0;
+ int lavc_param_coder=0;
+ int lavc_param_context=0;
+ char *lavc_param_intra_matrix = NULL;
+@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
+     {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 4, 24000000},
+     {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
9},
+-    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
++    {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
+     {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
+ //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
1, 31},
+ //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 
31},
+@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
+     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
-99, 99},
+     {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
+ //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+-    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
++    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
+     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, -31.0, 31.0},
+     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, 
TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
+     {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 20},
+     {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
+     {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
100000000},
+-    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
++    {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
+     {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000},
+     {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 
2000},
+     {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000},
+@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
+     {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 2000},
+     {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -2000, 2000},
+     {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
-2000, 2000},
+-    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
++    {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+-    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_TRELLIS_QUANT},
++    {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_TRELLIS_QUANT},
+ #else
+     {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
+ #endif
+@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
+     {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 8},
+     {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 16000},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
+-    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
++    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_H263P_AIC},
+ #else
+-    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
++    {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
+ #endif    
+     {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 
512},
+@@ -222,13 +222,13 @@ TCConfigEntry lavcopts_conf[]={
+     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+     {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
+-    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_INTERLACED_ME},
++    {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_INTERLACED_ME},
+     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -1000000, 1000000},
+     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, -1000000, 1000000},
+     {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
+     {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
+-    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_TRUNCATED},
+-    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, 
CODEC_FLAG_CLOSED_GOP},
++    {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_TRUNCATED},
++    {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, 
AV_CODEC_FLAG_CLOSED_GOP},
+     {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 16},
+     {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 
0, 1000},
+     {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, 
TCCONF_FLAG_RANGE, 0, 1000},
+--- a/import/import_ffmpeg.c
++++ b/import/import_ffmpeg.c
+@@ -310,7 +310,7 @@ do_avi:
+     lavc_dec_context->width  = x_dim;
+     lavc_dec_context->height = y_dim;
+ 
+-    if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
++    if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+     lavc_dec_context->error_resilience  = 2;
+ #else
+--- 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/video/transcode/transcode-imagemagick7.patch 
b/video/transcode/transcode-imagemagick7.patch
new file mode 100644
index 0000000..b9f1476
--- /dev/null
+++ b/video/transcode/transcode-imagemagick7.patch
@@ -0,0 +1,794 @@
+http://git.pld-linux.org/?p=packages/transcode.git;a=blob_plain;f=imagemagick7.patch;h=8411f89b843764eff8f4aaddb314d7773d1bcec8;hb=HEAD
+
+--- transcode-1.1.7/configure.in
++++ transcode-1.1.7/configure.in
+@@ -1105,8 +1105,8 @@
+ dnl ImageMagick
+ dnl
+ IMAGEMAGICK_EXTRA_LIBS="$IMAGEMAGICK_EXTRA_LIBS $($PKG_CONFIG --libs 
ImageMagick)"
+-TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [magick/api.h],
+- none, InitializeMagick, Wand, [http://www.imagemagick.org/])
++TC_PKG_CHECK(imagemagick, no, IMAGEMAGICK, no, [MagickWand/MagickWand.h],
++ none, InitializeMagick, MagickWand, [http://www.imagemagick.org/])
+ TC_PKG_HAVE(imagemagick, IMAGEMAGICK)
+ if test x"$have_imagemagick" = x"yes" ; then
+   SAVE_CPPFLAGS="$CPPFLAGS"
+@@ -1114,6 +1114,7 @@
+   AC_CHECK_HEADER([wand/magick-wand.h],
+     [AC_DEFINE([HAVE_BROKEN_WAND], [1], ["have old wand header"])])
+   CPPFLAGS="$SAVE_CPPFLAGS"
++  IMAGEMAGICK_CFLAGS="$IMAGEMAGICK_CFLAGS $($PKG_CONFIG --cflags 
ImageMagick)"
+ fi
+ 
+ dnl
+--- transcode-1.1.7/export/export_im.c
++++ transcode-1.1.7/export/export_im.c
+@@ -23,7 +23,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -82,7 +82,7 @@
+ 
+       codec = (vob->im_v_codec == CODEC_YUV) ? CODEC_YUV : CODEC_RGB;
+ 
+-      InitializeMagick("");
++      MagickCoreGenesis("", MagickFalse);
+ 
+       image_info=CloneImageInfo((ImageInfo *) NULL);
+ 
+@@ -169,8 +169,8 @@
+ MOD_encode
+ {
+ 
+-  ExceptionInfo exception_info;
+-  char *out_buffer = param->buffer;
++  ExceptionInfo *exception_info;
++  unsigned char *out_buffer = param->buffer;
+   Image *image=NULL;
+   int res;
+ 
+@@ -179,7 +179,7 @@
+ 
+   if(param->flag == TC_VIDEO) {
+ 
+-    GetExceptionInfo(&exception_info);
++    exception_info = AcquireExceptionInfo();
+ 
+     res = tc_snprintf(buf2, PATH_MAX, "%s%06d.%s", prefix, counter++, type);
+     if (res < 0) {
+@@ -193,11 +193,11 @@
+       out_buffer = tmp_buffer;
+     }
+ 
+-    image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, 
&exception_info);
++    image=ConstituteImage (width, height, "RGB", CharPixel, out_buffer, 
exception_info);
+ 
+     strlcpy(image->filename, buf2, MaxTextExtent);
+ 
+-    WriteImage(image_info, image);
++    WriteImage(image_info, image, exception_info);
+     DestroyImage(image);
+ 
+     return(0);
+@@ -220,8 +220,7 @@
+ 
+   if(param->flag == TC_VIDEO) {
+     DestroyImageInfo(image_info);
+-    ConstituteComponentTerminus();
+-    DestroyMagick();
++    MagickCoreTerminus();
+ 
+     free(tmp_buffer);
+     tmp_buffer = NULL;
+--- transcode-1.1.7/filter/filter_compare.c
++++ transcode-1.1.7/filter/filter_compare.c
+@@ -24,7 +24,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -111,9 +111,9 @@
+       Image *pattern, *resized, *orig = 0;
+       ImageInfo *image_info;
+ 
+-      PixelPacket *pixel_packet;
++      Quantum *pixel_quantum;
+       pixelsMask *pixel_last;
+-      ExceptionInfo exception_info;
++      ExceptionInfo *exception_info;
+ 
+       if(ptr->tag & TC_FILTER_GET_CONFIG) {
+               char buf[128];
+@@ -139,7 +139,7 @@
+       if(ptr->tag & TC_FILTER_INIT)
+       {
+ 
+-              unsigned int t,r,index;
++              unsigned int t,r;
+               pixelsMask *temp;
+ 
+               compare[instance] = tc_malloc(sizeof(compareData));
+@@ -190,22 +190,22 @@
+                               tc_log_perror(MOD_NAME, "could not open file 
for writing");
+                       }
+ 
+-                      InitializeMagick("");
++                      MagickCoreGenesis("", MagickFalse);
+                       if (verbose > 1)
+                 tc_log_info(MOD_NAME, "Magick Initialized successfully");
+ 
+-                      GetExceptionInfo(&exception_info);
++                      exception_info = AcquireExceptionInfo();
+                       image_info = CloneImageInfo ((ImageInfo *) NULL);
+                       strlcpy(image_info->filename, pattern_name, 
MaxTextExtent);
+                       if (verbose > 1)
+                            tc_log_info(MOD_NAME, "Trying to open image");
+                       orig = ReadImage(image_info,
+-                                       &exception_info);
++                                       exception_info);
+ 
+                       if (orig == (Image *) NULL) {
+-                              MagickWarning(exception_info.severity,
+-                                            exception_info.reason,
+-                                            exception_info.description);
++                              MagickWarning(exception_info->severity,
++                                            exception_info->reason,
++                                            exception_info->description);
+                               strlcpy(pattern_name, "/dev/null", 
sizeof(pattern_name));
+                       }else{
+                              if (verbose > 1)
+@@ -228,42 +228,41 @@
+               if (orig != NULL){
+                         // Flip and resize
+                       if (compare[instance]->vob->im_v_codec == CODEC_YUV)
+-                              TransformRGBImage(orig,YCbCrColorspace);
++                              TransformImageColorspace(orig, 
YCbCrColorspace, exception_info);
+                       if (verbose > 1) tc_log_info(MOD_NAME, "Resizing the 
Image");
+                       resized = ResizeImage(orig,
+                                             compare[instance]->width,
+                                             compare[instance]->height,
+                                             GaussianFilter,
+-                                            1,
+-                                            &exception_info);
++                                            exception_info);
+                       if (verbose > 1)
+                               tc_log_info(MOD_NAME, "Flipping the Image");
+-                      pattern = FlipImage(resized, &exception_info);
++                      pattern = FlipImage(resized, exception_info);
+                       if (pattern == (Image *) NULL) {
+-                              MagickError (exception_info.severity,
+-                                           exception_info.reason,
+-                                           exception_info.description);
++                              MagickError (exception_info->severity,
++                                           exception_info->reason,
++                                           exception_info->description);
+                       }
+ 
+                       // Filling the matrix with the pixels values not
+                       // alpha
+ 
+                       if (verbose > 1) tc_log_info(MOD_NAME, 
"GetImagePixels");
+-                      pixel_packet = GetImagePixels(pattern,0,0,
++                      pixel_quantum = GetAuthenticPixels(pattern,0,0,
+                                                     pattern->columns,
+-                                                    pattern->rows);
++                                                    pattern->rows,
++                                                    exception_info);
+ 
+                       if (verbose > 1) tc_log_info(MOD_NAME, "Filling the 
Image matrix");
+                       for (t = 0; t < pattern->rows; t++)
+                               for (r = 0; r < pattern->columns; r++){
+-                                      index = t*pattern->columns + r;
+-                                      if (pixel_packet[index].opacity == 0){
++                                      if (GetPixelAlpha(pattern, 
pixel_quantum) == QuantumRange) {
+                                               temp=tc_malloc(sizeof(struct 
pixelsMask));
+                                               temp->row=t;
+                                               temp->col=r;
+-                                              temp->r = 
(uint8_t)ScaleQuantumToChar(pixel_packet[index].red);
+-                                              temp->g = 
(uint8_t)ScaleQuantumToChar(pixel_packet[index].green);
+-                                              temp->b = 
(uint8_t)ScaleQuantumToChar(pixel_packet[index].blue);
++                                              temp->r = 
(uint8_t)ScaleQuantumToChar(GetPixelRed(pattern, pixel_quantum));
++                                              temp->g = 
(uint8_t)ScaleQuantumToChar(GetPixelGreen(pattern, pixel_quantum));
++                                              temp->b = 
(uint8_t)ScaleQuantumToChar(GetPixelBlue(pattern, pixel_quantum));
+                                               temp->next=NULL;
+ 
+                                               if (pixel_last == NULL){
+@@ -274,6 +273,7 @@
+                                                       pixel_last = temp;
+                                               }
+                                       }
++                                      pixel_quantum += 
GetPixelChannels(pattern);
+                               }
+ 
+                       if (verbose)
+@@ -297,7 +297,7 @@
+                       fclose(compare[instance]->results);
+                       free(compare[instance]);
+               }
+-              DestroyMagick();
++              MagickCoreTerminus();
+               compare[instance]=NULL;
+ 
+               return(0);
+--- transcode-1.1.7/filter/filter_logoaway.c
++++ transcode-1.1.7/filter/filter_logoaway.c
+@@ -70,7 +70,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -103,10 +103,10 @@
+ 
+   int           alpha;
+ 
+-  ExceptionInfo exception_info;
++  ExceptionInfo *exception_info;
+   Image         *image;
+   ImageInfo     *image_info;
+-  PixelPacket   *pixel_packet;
++  Quantum       *pixel_packet;
+ 
+   int           dump;
+   char          *dump_buf;
+@@ -174,7 +174,7 @@
+  *          instance    filter instance
+  * @return  void        nothing
+  *********************************************************/
+-static void work_with_rgb_frame(logoaway_data *LD, char *buffer, int width, 
int height)
++static void work_with_rgb_frame(logoaway_data *LD, unsigned char *buffer, 
int width, int height)
+ {
+   int row, col, i;
+   int xdistance, ydistance, distance_west, distance_north;
+@@ -201,10 +201,10 @@
+       }
+     }
+ 
+-    LD->dumpimage = ConstituteImage(LD->width-LD->xpos, 
LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, &LD->exception_info);
++    LD->dumpimage = ConstituteImage(LD->width-LD->xpos, 
LD->height-LD->ypos, "RGB", CharPixel, LD->dump_buf, LD->exception_info);
+     tc_snprintf(LD->dumpimage->filename, MaxTextExtent, "dump[%d].png", 
LD->id);
+ 
+-    WriteImage(LD->dumpimage_info, LD->dumpimage);
++    WriteImage(LD->dumpimage_info, LD->dumpimage, LD->exception_info);
+   }
+ 
+   switch(LD->mode) {
+@@ -218,27 +218,28 @@
+       for(row=LD->ypos; row<LD->height; ++row) {
+         for(col=LD->xpos; col<LD->width; ++col) {
+ 
++          Quantum *pixel = LD->pixel_packet + 
(row*LD->width+col)*GetPixelChannels(LD->image);
+           buf_off = ((height-row)*width+col) * 3;
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
+           /* R */
+           if (!LD->alpha) {
+               buffer[buf_off +0] = LD->rcolor;
+           } else {
+-              alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
pixel));
+               buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], 
LD->rcolor, alpha_px);
+           }
+           /* G */
+           if (!LD->alpha) {
+               buffer[buf_off +1] = LD->gcolor;
+           } else {
+-              alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green);
++              alpha_px = 
(uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel));
+               buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], 
LD->gcolor, alpha_px);
+           }
+           /* B */
+           if (!LD->alpha) {
+               buffer[buf_off +2] = LD->bcolor;
+           } else {
+-              alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].blue);
++              alpha_px = 
(uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel));
+               buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], 
LD->bcolor, alpha_px);
+           }
+         }
+@@ -268,6 +269,7 @@
+           buf_off = ((height-row)*width+col) * 3;
+ 
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++          Quantum *pixel = LD->pixel_packet + 
pkt_off*GetPixelChannels(LD->image);
+ 
+           /* R */
+           hcalc  = alpha_blending(buffer[buf_off_xpos +0], 
buffer[buf_off_width  +0], alpha_hori);
+@@ -276,7 +278,7 @@
+           if (!LD->alpha) {
+               buffer[buf_off +0] = new_px;
+           } else {
+-              alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++              alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
pixel));
+               buffer[buf_off +0] = alpha_blending(buffer[buf_off +0], 
new_px, alpha_px);
+           }
+           /* G */
+@@ -286,7 +288,7 @@
+           if (!LD->alpha) {
+               buffer[buf_off +1] = new_px;
+           } else {
+-              alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].green);
++              alpha_px = 
(uint8_t)ScaleQuantumToChar(GetPixelGreen(LD->image, pixel));
+               buffer[buf_off +1] = alpha_blending(buffer[buf_off +1], 
new_px, alpha_px);
+           }
+           /* B */
+@@ -296,7 +298,7 @@
+           if (!LD->alpha) {
+               buffer[buf_off +2] = new_px;
+           } else {
+-              alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++              alpha_px = 
(uint8_t)ScaleQuantumToChar(GetPixelBlue(LD->image, pixel));
+               buffer[buf_off +2] = alpha_blending(buffer[buf_off +2], 
new_px, alpha_px);
+           }
+         }
+@@ -327,28 +329,28 @@
+           buf_off_height = ((height-LD->height)*width+col) * 3;
+ 
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col-i>LD->xpos))
+             i++;
+           buf_off_xpos   = ((height-row)*width + col-i) * 3;
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col+i<LD->width))
+             i++;
+           buf_off_width  = ((height-row)*width + col+i) * 3;
+ 
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + 
(pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row-i>LD->ypos))
+             i++;
+           buf_off_ypos   = (height*width*3)-((row-i)*width - col) * 3;
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + 
(pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row+i<LD->height))
+             i++;
+           buf_off_height = (height*width*3)-((row+i)*width - col) * 3;
+ 
+-          alpha_px     = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px     = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+           /* R */
+           hcalc  = alpha_blending(buffer[buf_off_xpos +0], 
buffer[buf_off_width  +0], alpha_hori);
+           vcalc  = alpha_blending(buffer[buf_off_ypos +0], 
buffer[buf_off_height +0], alpha_vert);
+@@ -405,7 +407,7 @@
+  *          instance    filter instance
+  * @return  void        nothing
+  *********************************************************/
+-static void work_with_yuv_frame(logoaway_data *LD, char *buffer, int width, 
int height)
++static void work_with_yuv_frame(logoaway_data *LD, unsigned char *buffer, 
int width, int height)
+ {
+   int row, col, i;
+   int craddr, cbaddr;
+@@ -431,10 +433,11 @@
+ 
+           buf_off = row*width+col;
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++        Quantum *pixel = LD->pixel_packet + 
pkt_off*GetPixelChannels(LD->image);
+           if (!LD->alpha) {
+             buffer[buf_off] = LD->ycolor;
+           } else {
+-            alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++            alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
pixel));
+             buffer[buf_off] = alpha_blending(buffer[buf_off], LD->ycolor, 
alpha_px);
+           }
+         }
+@@ -446,8 +449,9 @@
+ 
+           buf_off = row*width/2+col;
+           pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + 
(col*2-LD->xpos);
++        Quantum *pixel = LD->pixel_packet + 
pkt_off*GetPixelChannels(LD->image);
+           /* sic */
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
pixel));
+           if (!LD->alpha) {
+             buffer[craddr + buf_off] = LD->ucolor;
+             buffer[cbaddr + buf_off] = LD->vcolor;
+@@ -483,10 +487,11 @@
+           buf_off_height = LD->height*width+col;
+ 
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
++        Quantum *pixel = LD->pixel_packet + 
pkt_off*GetPixelChannels(LD->image);
+ 
+           hcalc = alpha_blending(buffer[buf_off_xpos], 
buffer[buf_off_width],  alpha_hori);
+           vcalc = alpha_blending(buffer[buf_off_ypos], 
buffer[buf_off_height], alpha_vert);
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
pixel));
+           new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100;
+           if (!LD->alpha) {
+             buffer[buf_off] = new_px;
+@@ -517,7 +522,8 @@
+           buf_off_height = LD->height/2*width/2+col;
+ 
+           pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + 
(col*2-LD->xpos);
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red); 
++        Quantum *pixel = LD->pixel_packet + 
pkt_off*GetPixelChannels(LD->image);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
pixel)); 
+           /* sic, reuse red alpha_px */
+ 
+           hcalc  = alpha_blending(buffer[craddr + buf_off_xpos], 
buffer[craddr + buf_off_width],  alpha_hori);
+@@ -560,30 +566,30 @@
+           pkt_off = (row-LD->ypos) * (LD->width-LD->xpos) + (col-LD->xpos);
+ 
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col-i>LD->xpos))
+             i++;
+           buf_off_xpos   = (row*width + col-i);
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col+i<LD->width))
+             i++;
+           buf_off_width  = (row*width + col+i);
+ 
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + 
(pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row-i>LD->ypos))
+             i++;
+           buf_off_ypos   = ((row-i)*width + col);
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + 
(pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row+i<LD->height))
+             i++;
+           buf_off_height = ((row+i)*width + col);
+ 
+           hcalc  = alpha_blending( buffer[buf_off_xpos], 
buffer[buf_off_width],  alpha_hori );
+           vcalc  = alpha_blending( buffer[buf_off_ypos], 
buffer[buf_off_height], alpha_vert );
+-          alpha_px     = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px     = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+           new_px = (hcalc*LD->xweight + vcalc*LD->yweight)/100;
+           buffer[buf_off] = alpha_blending(buffer[buf_off], new_px, 
alpha_px);
+         }
+@@ -603,23 +609,23 @@
+           alpha_hori = xdistance * distance_west;
+ 
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + (pkt_off-i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col-i>LD->xpos))
+             i++;
+           buf_off_xpos   = (row*width/2 + col-i);
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + (pkt_off+i)*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (col+i<LD->width))
+             i++;
+           buf_off_width  = (row*width/2 + col+i);
+ 
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off-i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + 
(pkt_off-i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row-i>LD->ypos))
+             i++;
+           buf_off_ypos   = ((row-i)*width/2 + col);
+           i = 0;
+-          alpha_px = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off+i*(LD->width-LD->xpos)].red);
++          alpha_px = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + 
(pkt_off+i*(LD->width-LD->xpos))*GetPixelChannels(LD->image)));
+           while ((alpha_px != 255) && (row+i<LD->height))
+             i++;
+           buf_off_height = ((row+i)*width/2 + col);
+@@ -630,7 +636,7 @@
+ 
+           pkt_off = (row*2-LD->ypos) * (LD->width-LD->xpos) + 
(col*2-LD->xpos);
+ 
+-          alpha_px    = 
(uint8_t)ScaleQuantumToChar(LD->pixel_packet[pkt_off].red);
++          alpha_px    = (uint8_t)ScaleQuantumToChar(GetPixelRed(LD->image, 
LD->pixel_packet + pkt_off*GetPixelChannels(LD->image)));
+           /* sic: reuse the red component */
+           hcalc  = alpha_blending(buffer[craddr + buf_off_xpos], 
buffer[craddr + buf_off_width],  alpha_hori);
+           vcalc  = alpha_blending(buffer[craddr + buf_off_ypos], 
buffer[craddr + buf_off_height], alpha_vert);
+@@ -815,17 +821,17 @@
+     }
+ 
+     if((data[instance]->alpha) || (data[instance]->dump)) {
+-      InitializeMagick("");
+-      GetExceptionInfo(&data[instance]->exception_info);
++      MagickCoreGenesis("", MagickFalse);
++      data[instance]->exception_info = AcquireExceptionInfo();
+ 
+       if(data[instance]->alpha) {
+         data[instance]->image_info = CloneImageInfo((ImageInfo *) NULL);
+ 
+         strlcpy(data[instance]->image_info->filename, data[instance]->file, 
MaxTextExtent);
+-        data[instance]->image = ReadImage(data[instance]->image_info, 
&data[instance]->exception_info);
++        data[instance]->image = ReadImage(data[instance]->image_info, 
data[instance]->exception_info);
+         if (data[instance]->image == (Image *) NULL) {
+           tc_log_error(MOD_NAME, "\n");
+-          MagickWarning (data[instance]->exception_info.severity, 
data[instance]->exception_info.reason, 
data[instance]->exception_info.description);
++          MagickWarning (data[instance]->exception_info->severity, 
data[instance]->exception_info->reason, 
data[instance]->exception_info->description);
+           return TC_ERROR;
+         }
+ 
+@@ -835,7 +841,7 @@
+           return TC_ERROR;
+         }
+ 
+-        data[instance]->pixel_packet = 
GetImagePixels(data[instance]->image, 0, 0, data[instance]->image->columns, 
data[instance]->image->rows);
++        data[instance]->pixel_packet = 
GetAuthenticPixels(data[instance]->image, 0, 0, 
data[instance]->image->columns, data[instance]->image->rows, 
data[instance]->exception_info);
+       }
+       if(data[instance]->dump) {
+         if((data[instance]->dump_buf = tc_malloc 
((data[instance]->width-data[instance]->xpos)*(data[instance]->height-data[instance]->ypos)*3))
 == NULL)
+@@ -865,10 +871,9 @@
+     if (data[instance]->dumpimage != (Image *)NULL) {
+       DestroyImage(data[instance]->dumpimage);
+       DestroyImageInfo(data[instance]->dumpimage_info);
+-      ConstituteComponentTerminus();
+     }
+-    DestroyExceptionInfo(&data[instance]->exception_info);
+-    DestroyMagick();
++    DestroyExceptionInfo(data[instance]->exception_info);
++    MagickCoreTerminus();
+ 
+     if(data[instance]->dump_buf) free(data[instance]->dump_buf);
+     if(data[instance]) free(data[instance]);
+--- transcode-1.1.7/filter/filter_logo.c
++++ transcode-1.1.7/filter/filter_logo.c
+@@ -36,7 +36,7 @@
+ 
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+-#include <magick/api.h>
++#include <MagickCore/MagickCore.h>
+ #undef PACKAGE_BUGREPORT
+ #undef PACKAGE_NAME
+ #undef PACKAGE_STRING
+@@ -227,7 +227,8 @@
+                                ImageFormat  ifmt,
+                                int          do_rgbswap)
+ {
+-    PixelPacket *pixel_packet;
++    ExceptionInfo *exception_info;
++    Quantum *pixel_packet;
+     uint8_t *dst_ptr = dst;
+ 
+     int row, col;
+@@ -246,16 +247,17 @@
+     }
+     g_off = 1;
+ 
+-    pixel_packet = GetImagePixels(src, 0, 0, width, height);
++    exception_info = AcquireExceptionInfo();
++    pixel_packet = GetAuthenticPixels(src, 0, 0, width, height, 
exception_info);
+ 
+     for (row = 0; row < height; row++) {
+         for (col = 0; col < width; col++) {
+-            *(dst_ptr + r_off) = 
(uint8_t)ScaleQuantumToChar(pixel_packet->red);
+-            *(dst_ptr + g_off) = 
(uint8_t)ScaleQuantumToChar(pixel_packet->green);
+-            *(dst_ptr + b_off) = 
(uint8_t)ScaleQuantumToChar(pixel_packet->blue);
++            *(dst_ptr + r_off) = 
(uint8_t)ScaleQuantumToChar(GetPixelRed(src, pixel_packet));
++            *(dst_ptr + g_off) = 
(uint8_t)ScaleQuantumToChar(GetPixelGreen(src, pixel_packet));
++            *(dst_ptr + b_off) = 
(uint8_t)ScaleQuantumToChar(GetPixelBlue(src, pixel_packet));
+ 
+             dst_ptr += 3;
+-            pixel_packet++;
++            pixel_packet += GetPixelChannels(src);
+         }
+     }
+ 
+@@ -310,7 +312,7 @@
+         Image         *timg;
+         Image         *nimg;
+         ImageInfo     *image_info;
+-        ExceptionInfo  exception_info;
++        ExceptionInfo *exception_info;
+ 
+         int rgb_off = 0;
+ 
+@@ -376,19 +378,19 @@
+          * semaphore.
+          */
+         magick_usecount++;
+-        if (!IsMagickInstantiated()) {
+-            InitializeMagick("");
++        if (!IsMagickCoreInstantiated()) {
++            MagickCoreGenesis("", MagickFalse);
+         }
+ 
+-        GetExceptionInfo(&exception_info);
++        exception_info = AcquireExceptionInfo();
+         image_info = CloneImageInfo((ImageInfo *) NULL);
+         strlcpy(image_info->filename, mfd->file, MaxTextExtent);
+ 
+-        mfd->image = ReadImage(image_info, &exception_info);
++        mfd->image = ReadImage(image_info, exception_info);
+         if (mfd->image == (Image *) NULL) {
+-            MagickWarning(exception_info.severity,
+-                          exception_info.reason,
+-                          exception_info.description);
++            MagickWarning(exception_info->severity,
++                          exception_info->reason,
++                          exception_info->description);
+             strlcpy(mfd->file, "/dev/null", PATH_MAX);
+             return 0;
+         }
+@@ -413,11 +415,11 @@
+ 
+         while (mfd->images != (Image *)NULL) {
+             if (mfd->flip || flip) {
+-                timg = FlipImage(mfd->images, &exception_info);
++                timg = FlipImage(mfd->images, exception_info);
+                 if (timg == (Image *) NULL) {
+-                    MagickError(exception_info.severity,
+-                                exception_info.reason,
+-                                exception_info.description);
++                    MagickError(exception_info->severity,
++                                exception_info->reason,
++                                exception_info->description);
+                     return -1;
+                 }
+                 AppendImageToList(&nimg, timg);
+@@ -573,7 +575,7 @@
+         /* Set up image/video coefficient lookup tables */
+         if (img_coeff_lookup[0] < 0) {
+             int i;
+-            float maxrgbval = (float)MaxRGB; // from ImageMagick
++            float maxrgbval = (float)QuantumRange; // from ImageMagick
+ 
+             for (i = 0; i <= MAX_UINT8_VAL; i++) {
+                 float x = (float)ScaleCharToQuantum(i);
+@@ -615,8 +617,8 @@
+         }
+ 
+         magick_usecount--;
+-        if (magick_usecount == 0 && IsMagickInstantiated()) {
+-            DestroyMagick();
++        if (magick_usecount == 0 && IsMagickCoreInstantiated()) {
++            MagickCoreTerminus();
+         }
+ 
+         return 0;
+@@ -638,7 +640,8 @@
+         && (ptr->tag & TC_VIDEO)
+         && !(ptr->attributes & TC_FRAME_IS_SKIPPED)
+     ) {
+-        PixelPacket *pixel_packet;
++        ExceptionInfo *exception_info;
++        Quantum *pixel_packet;
+         uint8_t     *video_buf;
+ 
+         int   do_fade    = 0;
+@@ -647,6 +650,7 @@
+ 
+         /* Note: ImageMagick defines opacity = 0 as fully visible, and
+          * opacity = MaxRGB as fully transparent.
++         * alpha rather than opacity (0 transparent; QuantumRange opaque).
+          */
+         Quantum opacity;
+ 
+@@ -682,9 +686,11 @@
+             mfd->cur_delay = mfd->images->delay * vob->fps/100;
+         }
+ 
+-        pixel_packet = GetImagePixels(mfd->images, 0, 0,
++        exception_info = AcquireExceptionInfo();
++        pixel_packet = GetAuthenticPixels(mfd->images, 0, 0,
+                                       mfd->images->columns,
+-                                      mfd->images->rows);
++                                      mfd->images->rows,
++                                      exception_info);
+ 
+         if (vob->im_v_codec == CODEC_RGB) {
+             unsigned long r_off, g_off, b_off;
+@@ -702,30 +708,30 @@
+                 video_buf = ptr->video_buf + 3 * ((row + mfd->posy) * 
vob->ex_v_width + mfd->posx);
+ 
+                 for (col = 0; col < mfd->image->columns; col++) {
+-                    opacity = pixel_packet->opacity;
++                    opacity = QuantumRange - GetPixelAlpha(mfd->images, 
pixel_packet);
+ 
+                     if (do_fade)
+-                        opacity += (Quantum)((MaxRGB - opacity) * 
fade_coeff);
++                        opacity += (Quantum)((QuantumRange - opacity) * 
fade_coeff);
+ 
+                     if (opacity == 0) {
+-                        *(video_buf + r_off) = 
ScaleQuantumToChar(pixel_packet->red);
+-                        *(video_buf + g_off) = 
ScaleQuantumToChar(pixel_packet->green);
+-                        *(video_buf + b_off) = 
ScaleQuantumToChar(pixel_packet->blue);
+-                    } else if (opacity < MaxRGB) {
++                        *(video_buf + r_off) = 
ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet));
++                        *(video_buf + g_off) = 
ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet));
++                        *(video_buf + b_off) = 
ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet));
++                    } else if (opacity < QuantumRange) {
+                         unsigned char opacity_uchar = 
ScaleQuantumToChar(opacity);
+                         img_coeff = img_coeff_lookup[opacity_uchar];
+                         vid_coeff = vid_coeff_lookup[opacity_uchar];
+ 
+                         *(video_buf + r_off) = (uint8_t)((*(video_buf + 
r_off)) * vid_coeff)
+-                                                + 
(uint8_t)(ScaleQuantumToChar(pixel_packet->red)   * img_coeff);
++                                                + 
(uint8_t)(ScaleQuantumToChar(GetPixelRed(mfd->images, pixel_packet))   * 
img_coeff);
+                         *(video_buf + g_off) = (uint8_t)((*(video_buf + 
g_off)) * vid_coeff)
+-                                                + 
(uint8_t)(ScaleQuantumToChar(pixel_packet->green) * img_coeff);
++                                                + 
(uint8_t)(ScaleQuantumToChar(GetPixelGreen(mfd->images, pixel_packet)) * 
img_coeff);
+                         *(video_buf + b_off) = (uint8_t)((*(video_buf + 
b_off)) * vid_coeff)
+-                                                + 
(uint8_t)(ScaleQuantumToChar(pixel_packet->blue)  * img_coeff);
++                                                + 
(uint8_t)(ScaleQuantumToChar(GetPixelBlue(mfd->images, pixel_packet))  * 
img_coeff);
+                     }
+ 
+                     video_buf += 3;
+-                    pixel_packet++;
++                    pixel_packet += GetPixelChannels(mfd->images);
+                 }
+             }
+         } else { /* !RGB */
+@@ -745,10 +751,10 @@
+                 vid_pixel_V = vid_pixel_U + vid_size/4;
+                 for (col = 0; col < mfd->images->columns; col++) {
+                     int do_UV_pixels = (mfd->grayout == 0 && !(row % 2) && 
!(col % 2)) ? 1 : 0;
+-                    opacity = pixel_packet->opacity;
++                    opacity = QuantumRange - GetPixelAlpha(mfd->images, 
pixel_packet);
+ 
+                     if (do_fade)
+-                        opacity += (Quantum)((MaxRGB - opacity) * 
fade_coeff);
++                        opacity += (Quantum)((QuantumRange - opacity) * 
fade_coeff);
+ 
+                     if (opacity == 0) {
+                         *vid_pixel_Y = *img_pixel_Y;
+@@ -756,7 +762,7 @@
+                                 *vid_pixel_U = *img_pixel_U;
+                                 *vid_pixel_V = *img_pixel_V;
+                         }
+-                    } else if (opacity < MaxRGB) {
++                    } else if (opacity < QuantumRange) {
+                         unsigned char opacity_uchar = 
ScaleQuantumToChar(opacity);
+                         img_coeff = img_coeff_lookup[opacity_uchar];
+                         vid_coeff = vid_coeff_lookup[opacity_uchar];
+--- transcode-1.1.7/import/import_im.c
++++ transcode-1.1.7/import/import_im.c
+@@ -34,9 +34,9 @@
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+ #ifdef HAVE_BROKEN_WAND
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+ 
+ #undef PACKAGE_BUGREPORT
+--- transcode-1.1.7/import/import_imlist.c
++++ transcode-1.1.7/import/import_imlist.c
+@@ -34,9 +34,9 @@
+ /* Note: because of ImageMagick bogosity, this must be included first, so
+  * we can undefine the PACKAGE_* symbols it splats into our namespace */
+ #ifdef HAVE_BROKEN_WAND
+-#include <wand/magick-wand.h>
++#include <MagickWand/MagickWand.h>
+ #else /* we have a SANE wand header */
+-#include <wand/MagickWand.h>
++#include <MagickWand/MagickWand.h>
+ #endif /* HAVE_BROKEN_WAND */
+ 
+ #undef PACKAGE_BUGREPORT
+--- transcode-1.1.7/import/probe_im.c
++++ transcode-1.1.7/import/probe_im.c
+@@ -40,9 +40,9 @@
+ # undef PACKAGE_VERSION
+ 
+ # ifdef HAVE_BROKEN_WAND
+-# include <wand/magick-wand.h>
++# include <MagickWand/MagickWand.h>
+ # else /* we have a SANE wand header */
+-# include <wand/MagickWand.h>
++# include <MagickWand/MagickWand.h>
+ # endif /* HAVE_BROKEN_WAND */
+ 
+ # undef PACKAGE_BUGREPORT
diff --git a/video/transcode/transcode-swresample.patch 
b/video/transcode/transcode-swresample.patch
new file mode 100644
index 0000000..f2b8ee1
--- /dev/null
+++ b/video/transcode/transcode-swresample.patch
@@ -0,0 +1,20 @@
+--- transcode-1.1.7/filter/filter_resample.c.orig      2018-12-15 
20:00:16.111657609 +0000
++++ transcode-1.1.7/filter/filter_resample.c   2018-12-15 20:01:13.141800445 
+0000
+@@ -37,7 +37,7 @@
+ #include "libtc/optstr.h"
+ #include "libtc/tcavcodec.h"
+ #include "libtc/tcmodule-plugin.h"
+-#include <libavresample/avresample.h>
++#include <libswresample/swresample.h>
+ 
+ 
+ typedef struct {
+@@ -46,7 +46,7 @@
+ 
+     int bytes_per_sample;
+ 
+-    AVAudioResampleContext *resample_ctx;
++    SwrContext *resample_ctx;
+ } ResamplePrivateData;
+ 
+ static const char resample_help[] = ""