20240423.1 global branch merge.current-20240423.1current

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

42 files changed, 700 insertions, 2184 deletions

diff --git a/multimedia/aom/README b/multimedia/aom/README
deleted file mode 100644
index dbddf20cbb..0000000000
--- a/multimedia/aom/README
+++ /dev/null
@@ -1,7 +0,0 @@
-AOMedia Video 1 (AV1) is an Open Source video codec designed for
-video transmission over the Internet. AV1 is planned to surpass
-VP9 and also to eventually be a competitor with HEVC/H.265.
-
-This script builds the encoder aomenc, the decoder aomdec as well
-as shared libraries which can be utilised by suitable versions of
-both FFmpeg and vlc.
diff --git a/multimedia/aom/aom.SlackBuild b/multimedia/aom/aom.SlackBuild
deleted file mode 100644
index 1045d3e0a3..0000000000
--- a/multimedia/aom/aom.SlackBuild
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-# ----------------------------------------------------------------------
-# Slackware build script for aom
-#
-# Copyright (c) 2018-2023 Andrew Strong, Blue Mountains, Australia.
-#
-#   Permission to use, copy, modify, and distribute this software for
-#   any purpose with or without fee is hereby granted, provided that
-#   the above copyright notice and this permission notice appear in all
-#   copies.
-#
-#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-#   WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#   MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#   IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#   SUCH DAMAGE.
-# ----------------------------------------------------------------------
-
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PRGNAM=aom
-# The 'official' archive for the aom 3.6.0 release has the git commit in
-# the filename, so adjustments are required for a sane Slackware build:
-VERSION=${VERSION:-3.6.0}
-GITCOMMIT=${GITCOMMIT:-3c65175b1972da4a1992c1dae2365b48d13f9a8d}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-PKGTYPE=${PKGTYPE:-tgz}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir -p $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$GITCOMMIT.tar.gz -C $TMP/$PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-cd build
-
-  # I don't build either the HTML or the Latex docs as IMHO at this stage
-  # of aom development they are still not terribly useful for non-developers.
-  # To enable these docs change '-DENABLE_DOCS=0' below to '1' to build
-  # the docs and then uncomment the 'extra docs' section below to install them...
-
-  cmake \
-    -G "Unix Makefiles" \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_INCLUDEDIR=include \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_NASM=1 \
-    -DENABLE_DOCS=0 \
-    -DBUILD_SHARED_LIBS=1 \
-    -DENABLE_TESTS=0 \
-    ../
-  make -j1
-  make install DESTDIR=$PKG
-cd ..
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGELOG LICENSE PATENTS README.md Sample.cfg $PKG/usr/doc/$PRGNAM-$VERSION
-
-# These are the 'extra docs', more details above...
-# mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{html,latex}
-# cp -a build/docs/html/* $PKG/usr/doc/$PRGNAM-$VERSION/html
-# cp -a build/docs/latex/* $PKG/usr/doc/$PRGNAM-$VERSION/latex
-
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/multimedia/aom/aom.info b/multimedia/aom/aom.info
deleted file mode 100644
index 815f782382..0000000000
--- a/multimedia/aom/aom.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="aom"
-VERSION="3.6.0"
-HOMEPAGE="https://aomedia.googlesource.com/aom"
-DOWNLOAD="http://www.andrews-corner.org/downloads/aom-3c65175b1972da4a1992c1dae2365b48d13f9a8d.tar.gz"
-MD5SUM="4c73a44a710688e8c496b3740ecee84b"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Andrew Strong"
-EMAIL="andrew.david.strong@gmail.com"
diff --git a/multimedia/aom/slack-desc b/multimedia/aom/slack-desc
deleted file mode 100644
index 981c25fff9..0000000000
--- a/multimedia/aom/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-   |-----handy-ruler------------------------------------------------------|
-aom: aom (Open Source Video Codec)
-aom:
-aom: AOMedia Video 1 (AV1) is designed to be the successor to VP9 and
-aom: also to eventually be a direct competitor for HEVC/H.265.
-aom: This Slackbuild builds the 'reference' encoder aomenc as well as
-aom: the 'reference' decoder aomdec.
-aom:
-aom: Homepage: https://aomedia.googlesource.com/aom
-aom:
-aom:
-aom:
diff --git a/multimedia/avidemux/0004-support-nv-codec-headers-12.2.patch b/multimedia/avidemux/0004-support-nv-codec-headers-12.2.patch
new file mode 100644
index 0000000000..1f9afebba1
--- /dev/null
+++ b/multimedia/avidemux/0004-support-nv-codec-headers-12.2.patch
@@ -0,0 +1,292 @@
+diff -Naur ffmpeg-6.0.1.orig/libavcodec/nvenc.c ffmpeg-6.0.1/libavcodec/nvenc.c
+--- ffmpeg-6.0.1.orig/libavcodec/nvenc.c	2024-04-20 14:36:35.902732000 +0200
++++ ffmpeg-6.0.1/libavcodec/nvenc.c	2024-04-20 14:40:15.660732000 +0200
+@@ -233,8 +233,20 @@
+ 
+ static void nvenc_print_driver_requirement(AVCodecContext *avctx, int level)
+ {
+-#if NVENCAPI_CHECK_VERSION(12, 1)
++#if NVENCAPI_CHECK_VERSION(12, 3)
+     const char *minver = "(unknown)";
++#elif NVENCAPI_CHECK_VERSION(12, 2)
++# if defined(_WIN32) || defined(__CYGWIN__)
++    const char *minver = "551.76";
++# else
++    const char *minver = "550.54.14";
++# endif
++#elif NVENCAPI_CHECK_VERSION(12, 1)
++# if defined(_WIN32) || defined(__CYGWIN__)
++    const char *minver = "531.61";
++# else
++    const char *minver = "530.41.03";
++# endif
+ #elif NVENCAPI_CHECK_VERSION(12, 0)
+ # if defined(_WIN32) || defined(__CYGWIN__)
+     const char *minver = "522.25";
+@@ -585,6 +597,33 @@
+         return AVERROR(ENOSYS);
+     }
+ 
++#ifdef NVENC_HAVE_TEMPORAL_FILTER
++    ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_TEMPORAL_FILTER);
++    if(ctx->tf_level > 0 && ret <= 0) {
++        av_log(avctx, AV_LOG_WARNING, "Temporal filtering not supported by the device\n");
++        return AVERROR(ENOSYS);
++    }
++#endif
++
++#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL
++    ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_LOOKAHEAD_LEVEL);
++    if(ctx->rc_lookahead > 0 && ctx->lookahead_level > 0 &&
++       ctx->lookahead_level != NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT &&
++       ctx->lookahead_level > ret)
++    {
++        av_log(avctx, AV_LOG_WARNING, "Lookahead level not supported. Maximum level: %d\n", ret);
++        return AVERROR(ENOSYS);
++    }
++#endif
++
++#ifdef NVENC_HAVE_UNIDIR_B
++    ret = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_UNIDIRECTIONAL_B);
++    if(ctx->unidir_b && ret <= 0) {
++        av_log(avctx, AV_LOG_WARNING, "Unidirectional B-Frames not supported by the device\n");
++        return AVERROR(ENOSYS);
++    }
++#endif
++
+     ctx->support_dyn_bitrate = nvenc_check_cap(avctx, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE);
+ 
+     return 0;
+@@ -978,7 +1017,7 @@
+     return 0;
+ }
+ 
+-static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx)
++static av_cold int nvenc_setup_rate_control(AVCodecContext *avctx)
+ {
+     NvencContext *ctx = avctx->priv_data;
+ 
+@@ -1107,6 +1146,24 @@
+             if (ctx->encode_config.rcParams.lookaheadDepth < ctx->rc_lookahead)
+                 av_log(avctx, AV_LOG_WARNING, "Clipping lookahead depth to %d (from %d) due to lack of surfaces/delay",
+                     ctx->encode_config.rcParams.lookaheadDepth, ctx->rc_lookahead);
++
++#ifdef NVENC_HAVE_LOOKAHEAD_LEVEL
++            if (ctx->lookahead_level >= 0) {
++                switch (ctx->lookahead_level) {
++                    case NV_ENC_LOOKAHEAD_LEVEL_0:
++                    case NV_ENC_LOOKAHEAD_LEVEL_1:
++                    case NV_ENC_LOOKAHEAD_LEVEL_2:
++                    case NV_ENC_LOOKAHEAD_LEVEL_3:
++                    case NV_ENC_LOOKAHEAD_LEVEL_AUTOSELECT:
++                        break;
++                    default:
++                        av_log(avctx, AV_LOG_ERROR, "Invalid lookahead level.\n");
++                        return AVERROR(EINVAL);
++                }
++
++                ctx->encode_config.rcParams.lookaheadLevel = ctx->lookahead_level;
++            }
++#endif
+         }
+     }
+ 
+@@ -1134,6 +1191,8 @@
+         ctx->encode_config.rcParams.vbvBufferSize = avctx->rc_buffer_size = 0;
+         ctx->encode_config.rcParams.maxBitRate = avctx->rc_max_rate;
+     }
++
++    return 0;
+ }
+ 
+ static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx)
+@@ -1244,6 +1303,11 @@
+ 
+     h264->level = ctx->level;
+ 
++#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API
++    h264->inputBitDepth = h264->outputBitDepth =
++        IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8;
++#endif
++
+     if (ctx->coder >= 0)
+         h264->entropyCodingMode = ctx->coder;
+ 
+@@ -1357,7 +1421,12 @@
+ 
+     hevc->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1;
+ 
++#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API
++    hevc->inputBitDepth = hevc->outputBitDepth =
++        IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8;
++#else
+     hevc->pixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0;
++#endif
+ 
+     hevc->level = ctx->level;
+ 
+@@ -1373,6 +1442,25 @@
+     hevc->numRefL1 = avctx->refs;
+ #endif
+ 
++#ifdef NVENC_HAVE_TEMPORAL_FILTER
++    if (ctx->tf_level >= 0) {
++        hevc->tfLevel = ctx->tf_level;
++
++        switch (ctx->tf_level)
++        {
++            case NV_ENC_TEMPORAL_FILTER_LEVEL_0:
++            case NV_ENC_TEMPORAL_FILTER_LEVEL_4:
++                break;
++            default:
++                av_log(avctx, AV_LOG_ERROR, "Invalid temporal filtering level.\n");
++                return AVERROR(EINVAL);
++        }
++
++        if (ctx->encode_config.frameIntervalP < 5)
++            av_log(avctx, AV_LOG_WARNING, "Temporal filtering needs at least 4 B-Frames (-bf 4).\n");
++    }
++#endif
++
+     return 0;
+ }
+ 
+@@ -1443,8 +1531,13 @@
+ 
+     av1->chromaFormatIDC = IS_YUV444(ctx->data_pix_fmt) ? 3 : 1;
+ 
++#ifdef NVENC_HAVE_NEW_BIT_DEPTH_API
++    av1->inputBitDepth = IS_10BIT(ctx->data_pix_fmt) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8;
++    av1->outputBitDepth = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? NV_ENC_BIT_DEPTH_10 : NV_ENC_BIT_DEPTH_8;
++#else
+     av1->inputPixelBitDepthMinus8 = IS_10BIT(ctx->data_pix_fmt) ? 2 : 0;
+     av1->pixelBitDepthMinus8 = (IS_10BIT(ctx->data_pix_fmt) || ctx->highbitdepth) ? 2 : 0;
++#endif
+ 
+     if (ctx->b_ref_mode >= 0)
+         av1->useBFramesAsRef = ctx->b_ref_mode;
+@@ -1567,6 +1660,10 @@
+         ctx->init_encode_params.frameRateDen = avctx->time_base.num * avctx->ticks_per_frame;
+     }
+ 
++#ifdef NVENC_HAVE_UNIDIR_B
++    ctx->init_encode_params.enableUniDirectionalB = ctx->unidir_b;
++#endif
++
+     ctx->init_encode_params.enableEncodeAsync = 0;
+     ctx->init_encode_params.enablePTD = 1;
+ 
+@@ -1617,7 +1714,9 @@
+ 
+     nvenc_recalc_surfaces(avctx);
+ 
+-    nvenc_setup_rate_control(avctx);
++    res = nvenc_setup_rate_control(avctx);
++    if (res < 0)
++        return res;
+ 
+     if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) {
+         ctx->encode_config.frameFieldMode = NV_ENC_PARAMS_FRAME_FIELD_MODE_FIELD;
+@@ -1673,16 +1772,16 @@
+ {
+     switch (pix_fmt) {
+     case AV_PIX_FMT_YUV420P:
+-        // MEANX return NV_ENC_BUFFER_FORMAT_YV12_PL;
++        return NV_ENC_BUFFER_FORMAT_YV12;
+     case AV_PIX_FMT_NV12:
+-        return NV_ENC_BUFFER_FORMAT_NV12_PL;
++        return NV_ENC_BUFFER_FORMAT_NV12;
+     case AV_PIX_FMT_P010:
+     case AV_PIX_FMT_P016:
+         return NV_ENC_BUFFER_FORMAT_YUV420_10BIT;
+ #if 0 /* MEANX */
+     case AV_PIX_FMT_GBRP:
+     case AV_PIX_FMT_YUV444P:
+-        return NV_ENC_BUFFER_FORMAT_YUV444_PL;
++        return NV_ENC_BUFFER_FORMAT_YUV444;
+     case AV_PIX_FMT_GBRP16:
+     case AV_PIX_FMT_YUV444P16:
+         return NV_ENC_BUFFER_FORMAT_YUV444_10BIT;
+@@ -2309,12 +2408,6 @@
+     frame_data->duration = frame->duration;
+     frame_data->frame_opaque = frame->opaque;
+ 
+-#if FF_API_REORDERED_OPAQUE
+-FF_DISABLE_DEPRECATION_WARNINGS
+-    frame_data->reordered_opaque = frame->reordered_opaque;
+-FF_ENABLE_DEPRECATION_WARNINGS
+-#endif
+-
+     ctx->frame_data_array_pos = (ctx->frame_data_array_pos + 1) % ctx->frame_data_array_nb;
+     pic_params->inputDuration = idx;
+ 
+@@ -2331,12 +2424,6 @@
+ 
+     pkt->duration = frame_data->duration;
+ 
+-#if FF_API_REORDERED_OPAQUE
+-FF_DISABLE_DEPRECATION_WARNINGS
+-    avctx->reordered_opaque = frame_data->reordered_opaque;
+-FF_ENABLE_DEPRECATION_WARNINGS
+-#endif
+-
+     if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
+         pkt->opaque = frame_data->frame_opaque;
+         pkt->opaque_ref = frame_data->frame_opaque_ref;
+@@ -2724,6 +2811,7 @@
+             pic_params.encodePicFlags = 0;
+         }
+ 
++        pic_params.frameIdx = ctx->frame_idx_counter++;
+         pic_params.inputTimeStamp = frame->pts;
+ 
+         if (ctx->extra_sei) {
+diff -Naur ffmpeg-6.0.1.orig/libavcodec/nvenc.h ffmpeg-6.0.1/libavcodec/nvenc.h
+--- ffmpeg-6.0.1.orig/libavcodec/nvenc.h	2023-11-10 01:30:25.000000000 +0100
++++ ffmpeg-6.0.1/libavcodec/nvenc.h	2024-04-20 14:42:22.556732000 +0200
+@@ -83,6 +83,15 @@
+ #define NVENC_NO_DEPRECATED_RC
+ #endif
+ 
++// SDK 12.2 compile time feature checks
++#if NVENCAPI_CHECK_VERSION(12, 2)
++#define NVENC_HAVE_NEW_BIT_DEPTH_API
++#define NVENC_HAVE_TEMPORAL_FILTER
++#define NVENC_HAVE_LOOKAHEAD_LEVEL
++#define NVENC_HAVE_UHQ_TUNING
++#define NVENC_HAVE_UNIDIR_B
++#endif
++
+ typedef struct NvencSurface
+ {
+     NV_ENC_INPUT_PTR input_surface;
+@@ -100,10 +109,6 @@
+ {
+     int64_t duration;
+ 
+-#if FF_API_REORDERED_OPAQUE
+-    int64_t reordered_opaque;
+-#endif
+-
+     void        *frame_opaque;
+     AVBufferRef *frame_opaque_ref;
+ } NvencFrameData;
+@@ -215,6 +220,8 @@
+ 
+     void *nvencoder;
+ 
++    uint32_t frame_idx_counter;
++
+     int preset;
+     int profile;
+     int level;
+@@ -262,6 +269,9 @@
+     int udu_sei;
+     int timing_info;
+     int highbitdepth;
++    int tf_level;
++    int lookahead_level;
++    int unidir_b;
+ } NvencContext;
+ 
+ int ff_nvenc_encode_init(AVCodecContext *avctx);
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index 37202fb9d3..15cce7f22f 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -5,7 +5,7 @@
 # Derived from a SlackBuild by Eric Hameleers.
 # Copyright 2009, 2010, 2011, 2013  Eric Hameleers, Eindhoven, NL
 # Copyright 2015 John Vogel Corning, NY USA
-# Copyright 2017-2022 Matteo Bernardini, Pisa, IT
+# Copyright 2017-2024 Matteo Bernardini, Pisa, IT
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -31,7 +31,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=avidemux
-VERSION=${VERSION:-2.8.1}
+VERSION=${VERSION:-20240417_ac7587b}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -75,7 +75,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}_${VERSION}
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.?z
 cd ${PRGNAM}_${VERSION}
 chown -R root:root .
 find -L . \
@@ -90,6 +90,9 @@ find -L . \
 sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash || exit 1
 sed -i 's|0.19|1.0|' avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt || exit 1
 
+mkdir -p avidemux_core/ffmpeg_package/patches/upstream
+cp $CWD/0004-support-nv-codec-headers-12.2.patch avidemux_core/ffmpeg_package/patches/upstream
+
 bash bootStrap.bash --with-core --with-cli --with-plugins
 
 make -C buildCli DESTDIR="$PKG" install
diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info
index 948c45dcc6..d6a3da1e89 100644
--- a/multimedia/avidemux/avidemux.info
+++ b/multimedia/avidemux/avidemux.info
@@ -1,8 +1,8 @@
 PRGNAM="avidemux"
-VERSION="2.8.1"
+VERSION="20240417_ac7587b"
 HOMEPAGE="http://avidemux.org"
-DOWNLOAD="http://downloads.sf.net/avidemux/avidemux_2.8.1.tar.gz"
-MD5SUM="fee41934cba460ec0fde2a453d5a6307"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/avidemux_20240417_ac7587b.tar.xz"
+MD5SUM="21dfb34ecacb4fca7d50cd2c54b3a181"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 libdca x264 xvidcore"
diff --git a/multimedia/ccextractor/ccextractor.SlackBuild b/multimedia/ccextractor/ccextractor.SlackBuild
index 8e072caee8..7ac1170764 100644
--- a/multimedia/ccextractor/ccextractor.SlackBuild
+++ b/multimedia/ccextractor/ccextractor.SlackBuild
@@ -98,8 +98,8 @@ cd build
     -DMAN_INSTALL_DIR=/usr/man \
     -DWITHOUT_RUST=ON \
     -DWITH_OCR=ON \
-    -DWITH_HARDSUBX=ON \
-    -DWITH_FFMPEG=ON \
+    -DWITH_HARDSUBX=OFF \
+    -DWITH_FFMPEG=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install/strip DESTDIR=$PKG
diff --git a/multimedia/cinelerra/cinelerra.SlackBuild b/multimedia/cinelerra/cinelerra.SlackBuild
index 1d88525bc0..424392f9a9 100644
--- a/multimedia/cinelerra/cinelerra.SlackBuild
+++ b/multimedia/cinelerra/cinelerra.SlackBuild
@@ -28,7 +28,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cinelerra
-VERSION=${VERSION:-20210331_eabda9c}
+VERSION=${VERSION:-20231006_bfc2f6c}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -88,6 +88,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+sed -i "s|ffplay|ffplay --disable-htmlpages|" thirdparty/Makefile
+
 ./autogen.sh
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/multimedia/cinelerra/cinelerra.info b/multimedia/cinelerra/cinelerra.info
index 296f02857f..74df7b48e8 100644
--- a/multimedia/cinelerra/cinelerra.info
+++ b/multimedia/cinelerra/cinelerra.info
@@ -1,8 +1,8 @@
 PRGNAM="cinelerra"
-VERSION="20210331_eabda9c"
+VERSION="20231006_bfc2f6c"
 HOMEPAGE="https://cinelerra-gg.org"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/cinelerra-gg-20210331_eabda9c.tar.xz"
-MD5SUM="fd7a1f289192a8f1f77d0a494f8f204b"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/cinelerra-gg-20231006_bfc2f6c.tar.xz"
+MD5SUM="1d496163396c4f5dc427cbbd7748fb90"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faac faad2 libavc1394 libdv libiec61883 mjpegtools x264"
diff --git a/multimedia/gpac/README b/multimedia/gpac/README
index 1e7c8f82a2..a2020a9bcb 100644
--- a/multimedia/gpac/README
+++ b/multimedia/gpac/README
@@ -1,6 +1,3 @@
 GPAC is mainly used to package multimedia content for local or
 streaming playback. GPAC includes MP4Box utility which lets packaging
 of various audio and video codecs into mp4 container.
-
-Optional dependencies include the following: wxPython, js, faad2,
-ffmpeg, xvidcore, jack, xulrunner and xmlrpc-c.
diff --git a/multimedia/gpac/ffmpeg-6.patch b/multimedia/gpac/ffmpeg-6.patch
new file mode 100644
index 0000000000..0e7c18299d
--- /dev/null
+++ b/multimedia/gpac/ffmpeg-6.patch
@@ -0,0 +1,51 @@
+From ba14e34dd7a3c4cef5a56962898e9f863dd4b4f3 Mon Sep 17 00:00:00 2001
+From: jeanlf <jeanlf@gpac.io>
+Date: Mon, 13 Mar 2023 09:43:52 +0100
+Subject: [PATCH] fixed compil with ffmpeg 6 - cf #2406
+
+---
+ src/filters/ff_mx.c | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/src/filters/ff_mx.c b/src/filters/ff_mx.c
+index 34e5f59e7c..5cf1d98941 100644
+--- a/src/filters/ff_mx.c
++++ b/src/filters/ff_mx.c
+@@ -503,7 +503,11 @@ static GF_Err ffmx_close_seg(GF_Filter *filter, GF_FFMuxCtx *ctx, Bool send_evt_
+ 		evt.seg_size.is_init = 0;
+ 	}
+ 	evt.seg_size.media_range_start = ctx->offset_at_seg_start;
++#if LIBAVFORMAT_VERSION_MAJOR < 60
+ 	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->written-1) : 0;
++#else
++	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->bytes_written-1) : 0;
++#endif
+ 	ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+ 
+ 	gf_filter_pid_send_event(pid, &evt);
+@@ -1013,13 +1017,21 @@ static GF_Err ffmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_r
+ 		ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, &ff_codec_tag);
+ 	}
+ 
++
++	res = 1;
++#if LIBAVFORMAT_VERSION_MAJOR < 60
+ 	if (ctx->muxer->oformat && ctx->muxer->oformat->query_codec) {
+ 		res = ctx->muxer->oformat->query_codec(ff_codec_id, 1);
+-		if (!res) {
+-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
+-			return GF_NOT_SUPPORTED;
+-		}
+ 	}
++#else
++	res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, FF_COMPLIANCE_NORMAL);
++#endif
++
++	if (!res) {
++		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
++		return GF_NOT_SUPPORTED;
++	}
++
+ 	const AVCodec *c = avcodec_find_decoder(ff_codec_id);
+ 	if (!c) return GF_NOT_SUPPORTED;
+ 
diff --git a/multimedia/gpac/gpac.SlackBuild b/multimedia/gpac/gpac.SlackBuild
index 3d47f2be9d..e981e25b6a 100644
--- a/multimedia/gpac/gpac.SlackBuild
+++ b/multimedia/gpac/gpac.SlackBuild
@@ -28,7 +28,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM="gpac"
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -69,57 +69,33 @@ else
   LIBDIRSUFFIX=""
 fi
 
-### wxwidgets support
-if [ "${WX_SUPPORT:-no}" = "no" ]; then
-  wx_option="--disable-wx"
-else
-  wx_option="--enable-wx"
-fi
-
-if [ "${AMR:-no}" = "no" ]; then
-    amr_option="--disable-amr"
-else
-    amr_option="--enable-amr"
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -fR $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-chown -R root.root .
+chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# configure doesn't have --libdir option.
-sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure
+patch -p1 < $CWD/ffmpeg-6.patch
 
 ./configure \
   --prefix=/usr \
+  --libdir=lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
   --disable-opt \
   --enable-pic \
-  --enable-pulseaudio \
   --cpu=${ARCH} \
-  --extra-cflags="$SLKCFLAGS" \
-  $wx_option \
-  $amr_option
-
-make -j1
-make install DESTDIR=$PKG
-make install-lib DESTDIR=$PKG
-
-### remove $PKG/usr/share/gpac directory
-### only contains gpac.mp4 file which
-### doesn't seem to play with mplayer
-#rm -fr $PKG/usr/share
+  --extra-cflags="$SLKCFLAGS"
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make
+make install DESTDIR=$PKG STRIP=true
+make install-lib DESTDIR=$PKG STRIP=true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/multimedia/gpac/gpac.info b/multimedia/gpac/gpac.info
index 9b1adc7085..537f6fd8da 100644
--- a/multimedia/gpac/gpac.info
+++ b/multimedia/gpac/gpac.info
@@ -1,8 +1,8 @@
 PRGNAM="gpac"
-VERSION="1.0.1"
+VERSION="2.2.1"
 HOMEPAGE="http://gpac.wp.mines-telecom.fr"
-DOWNLOAD="https://github.com/gpac/gpac/archive/v1.0.1/gpac-1.0.1.tar.gz"
-MD5SUM="52f6711e43a8d271ebec0c2ea2afab4a"
+DOWNLOAD="https://github.com/gpac/gpac/archive/v2.2.1/gpac-2.2.1.tar.gz"
+MD5SUM="a1a4a6c7f1525431b211b5ba47253ed0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
index 5fdcb0305a..3bfe805da8 100644
--- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
+++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gst-plugins-bad-nonfree
 
-# Copyright 2013-2021  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2013-2024  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -32,7 +32,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gst-plugins-bad-nonfree
-VERSION=${VERSION:-1.18.5}
+VERSION=${VERSION:-1.24.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -206,7 +206,20 @@ cd build
     -Dvulkan=disabled \
     -Dwayland=disabled \
     -Dwebrtc=disabled \
-    -Dwebp=disabled
+    -Dwebp=disabled \
+    -Daes=disabled \
+    -Danalyticsoverlay=disabled \
+    -Dassrender=disabled \
+    -Dcodec2json=disabled \
+    -Dcodecalpha=disabled \
+    -Dcodectimestamper=disabled \
+    -Dinsertbin=disabled \
+    -Dmse=disabled \
+    -Dqroverlay=disabled \
+    -Dqsv=disabled \
+    -Dunixfd=disabled \
+    -Duvcgadget=disabled \
+    -Dzxing=disabled
   "${NINJA:=ninja}"
   DESTDIR=$PKG $NINJA install
 cd ..
diff --git a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
index 43340d39f2..bfc39e9e8d 100644
--- a/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
+++ b/multimedia/gst-plugins-bad-nonfree/gst-plugins-bad-nonfree.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-bad-nonfree"
-VERSION="1.18.5"
+VERSION="1.24.0"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz"
-MD5SUM="4ab1c19c3cf1ba79c20c65f6be78e7fd"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.24.0.tar.xz"
+MD5SUM="22982dd1f7baffa6435551cbe156b888"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
index d5d9e11406..389ced3753 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gst-plugins-ugly
 
-# Copyright 2013-2021  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2013-2024  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gst-plugins-ugly
-VERSION=${VERSION:-1.18.5}
+VERSION=${VERSION:-1.24.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -90,8 +90,7 @@ cd build
     --localstatedir=/var \
     --mandir=/usr/man \
     --prefix=/usr \
-    --sysconfdir=/etc \
-    -Dexamples=disabled
+    --sysconfdir=/etc
   "${NINJA:=ninja}"
   DESTDIR=$PKG $NINJA install
 cd ..
diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
index 5a55a8aa0f..18cae775d4 100644
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
+++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.info
@@ -1,8 +1,8 @@
 PRGNAM="gst-plugins-ugly"
-VERSION="1.18.5"
+VERSION="1.24.0"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
-DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.18.5.tar.xz"
-MD5SUM="049f90b7a3a72e241ad47564b5cd7a7a"
+DOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.24.0.tar.xz"
+MD5SUM="a6bcb986c035bd58d62ac2accaa36bbc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild
index 0d62385bcf..901a074701 100644
--- a/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild
+++ b/multimedia/intel-gmmlib/intel-gmmlib.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=intel-gmmlib
-VERSION=${VERSION:-21.3.1}
+VERSION=${VERSION:-22.3.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
diff --git a/multimedia/intel-gmmlib/intel-gmmlib.info b/multimedia/intel-gmmlib/intel-gmmlib.info
index 56c6e5218b..0c605461d6 100644
--- a/multimedia/intel-gmmlib/intel-gmmlib.info
+++ b/multimedia/intel-gmmlib/intel-gmmlib.info
@@ -1,8 +1,8 @@
 PRGNAM="intel-gmmlib"
-VERSION="21.3.1"
+VERSION="22.3.9"
 HOMEPAGE="https://github.com/intel/gmmlib/"
-DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-21.3.1/gmmlib-intel-gmmlib-21.3.1.tar.gz"
-MD5SUM="e6755c5d0f44e336f298cee9c7c3fdae"
+DOWNLOAD="https://github.com/intel/gmmlib/archive/intel-gmmlib-22.3.9/gmmlib-intel-gmmlib-22.3.9.tar.gz"
+MD5SUM="b9891f96c736f07a4431a7e97843cdc2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/intel-media-driver/intel-media-driver.SlackBuild b/multimedia/intel-media-driver/intel-media-driver.SlackBuild
index dfb1b3b30b..a17fb38d63 100644
--- a/multimedia/intel-media-driver/intel-media-driver.SlackBuild
+++ b/multimedia/intel-media-driver/intel-media-driver.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=intel-media-driver
-VERSION=${VERSION:-21.3.5}
+VERSION=${VERSION:-23.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -95,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CODEOWNERS LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.md README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/multimedia/intel-media-driver/intel-media-driver.info b/multimedia/intel-media-driver/intel-media-driver.info
index 1967da2f92..0be2ff6c49 100644
--- a/multimedia/intel-media-driver/intel-media-driver.info
+++ b/multimedia/intel-media-driver/intel-media-driver.info
@@ -1,8 +1,8 @@
 PRGNAM="intel-media-driver"
-VERSION="21.3.5"
+VERSION="23.3.0"
 HOMEPAGE="https://github.com/intel/media-driver/"
-DOWNLOAD="https://github.com/intel/media-driver/archive/intel-media-21.3.5/media-driver-intel-media-21.3.5.tar.gz"
-MD5SUM="3ace8aec373b3990acb1e3270e4a9e0b"
+DOWNLOAD="https://github.com/intel/media-driver/archive/intel-media-23.3.0/media-driver-intel-media-23.3.0.tar.gz"
+MD5SUM="3b5eda7543298f7fecbce14af5fa1385"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="intel-gmmlib"
diff --git a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild
index 2c3f1e67bf..6adf652d14 100644
--- a/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild
+++ b/multimedia/intel-media-sdk/intel-media-sdk.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=intel-media-sdk
-VERSION=${VERSION:-21.3.5}
+VERSION=${VERSION:-23.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -78,6 +78,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fix for gcc >= 13.x
+sed -i '/mfxloader/i #include <cstdint>' api/mfx_dispatch/linux/mfxparser.cpp
+
 mkdir -p build
 cd build
   cmake \
diff --git a/multimedia/intel-media-sdk/intel-media-sdk.info b/multimedia/intel-media-sdk/intel-media-sdk.info
index 8ac23ebd28..8c2d7f82ad 100644
--- a/multimedia/intel-media-sdk/intel-media-sdk.info
+++ b/multimedia/intel-media-sdk/intel-media-sdk.info
@@ -1,8 +1,8 @@
 PRGNAM="intel-media-sdk"
-VERSION="21.3.5"
+VERSION="23.2.2"
 HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK/"
-DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-21.3.5/MediaSDK-intel-mediasdk-21.3.5.tar.gz"
-MD5SUM="7a71beb6def13ab71348785a8880dd0a"
+DOWNLOAD="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-23.2.2/MediaSDK-intel-mediasdk-23.2.2.tar.gz"
+MD5SUM="7f348210213fd4a67466b3a20e4b93d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/multimedia/obs-studio/obs-studio.SlackBuild b/multimedia/obs-studio/obs-studio.SlackBuild
index bcbab1aea3..2580e45f54 100644
--- a/multimedia/obs-studio/obs-studio.SlackBuild
+++ b/multimedia/obs-studio/obs-studio.SlackBuild
@@ -95,6 +95,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
 
 mkdir -p build
 cd build
diff --git a/multimedia/obs-studio/patches/1_7ed9b1f.patch b/multimedia/obs-studio/patches/1_7ed9b1f.patch
new file mode 100644
index 0000000000..438004ea39
--- /dev/null
+++ b/multimedia/obs-studio/patches/1_7ed9b1f.patch
@@ -0,0 +1,43 @@
+From 7ed9b1f3a6b5e73a39daf906c8e8c19e93fce4b4 Mon Sep 17 00:00:00 2001
+From: Stephen Seo <seo.disparate@gmail.com>
+Date: Wed, 29 Nov 2023 22:06:09 +0900
+Subject: [PATCH] deps/media-playback: Use new (nb_)coded_side_data FFmpeg 6.1
+ API
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+The change in deps/media-playback/media-playback/decode.c is due to
+FFmpeg moving "side_data" into AVCodecParameters which is mentioned in
+commit [1] in FFmpeg's repository.
+
+In summary of the "side_data" change, AVStream.side_data is deprecated
+and replaced with AVStream.codecpar->coded_side_data, and
+AVStream.nb_side_data is replaced with
+AVStream.codecpar->nb_coded_side_data.
+
+[1]: avcodec/codec_par: add side data to AVCodecParameters
+https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe
+---
+ deps/media-playback/media-playback/decode.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c
+index 55b91c140ace4..40853f171bde7 100644
+--- a/deps/media-playback/media-playback/decode.c
++++ b/deps/media-playback/media-playback/decode.c
+@@ -114,8 +114,14 @@ static uint16_t get_max_luminance(const AVStream *stream)
+ {
+ 	uint32_t max_luminance = 0;
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 	for (int i = 0; i < stream->nb_side_data; i++) {
+ 		const AVPacketSideData *const sd = &stream->side_data[i];
++#else
++	for (int i = 0; i < stream->codecpar->nb_coded_side_data; i++) {
++		const AVPacketSideData *const sd =
++			&stream->codecpar->coded_side_data[i];
++#endif
+ 		switch (sd->type) {
+ 		case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: {
+ 			const AVMasteringDisplayMetadata *mastering =
diff --git a/multimedia/obs-studio/patches/2_92fc9f6.patch b/multimedia/obs-studio/patches/2_92fc9f6.patch
new file mode 100644
index 0000000000..db0221d0a9
--- /dev/null
+++ b/multimedia/obs-studio/patches/2_92fc9f6.patch
@@ -0,0 +1,43 @@
+From 92fc9f69ccff2cb12bb8ef877e9238f5d46588a8 Mon Sep 17 00:00:00 2001
+From: Stephen Seo <seo.disparate@gmail.com>
+Date: Wed, 29 Nov 2023 22:08:42 +0900
+Subject: [PATCH] deps/media-playback: In check for key-frame, use new FFmpeg
+ 6.1 API
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+AVFrame.key_frame was replaced with a flag in AVFrame.flags. The commit
+adding the flag is [1] in FFmpeg's repository, and the deprecation is in
+commit [2].
+
+In summary of the "key_frame" change, AVFrame.key_frame is deprecated,
+and AVFrame.flags indicates with a bit flag if it is a key frame (with
+the enum/defined AV_FRAME_FLAG_KEY).
+
+[1]: avutil/frame: add a keyframe flag to AVFrame
+https://github.com/FFmpeg/FFmpeg/commit/cc11191fda0471017b03c1434d6d8cb79f6914e5
+
+[2]: avutil/frame: deprecate key_frame
+https://github.com/FFmpeg/FFmpeg/commit/3e06f6f04020bef32fa42bc9d7f96e76a46453aa
+---
+ deps/media-playback/media-playback/media.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c
+index 566eb9e35c9ef..07b040dd8235c 100644
+--- a/deps/media-playback/media-playback/media.c
++++ b/deps/media-playback/media-playback/media.c
+@@ -504,7 +504,12 @@ void mp_media_next_video(mp_media_t *m, bool preload)
+ 	}
+ 
+ 	if (!m->is_local_file && !d->got_first_keyframe) {
++
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58, 29, 100)
+ 		if (!f->key_frame)
++#else
++		if (!(f->flags & AV_FRAME_FLAG_KEY))
++#endif
+ 			return;
+ 
+ 		d->got_first_keyframe = true;
diff --git a/multimedia/obs-studio/patches/3_ed1e079.patch b/multimedia/obs-studio/patches/3_ed1e079.patch
new file mode 100644
index 0000000000..d1e435ca9d
--- /dev/null
+++ b/multimedia/obs-studio/patches/3_ed1e079.patch
@@ -0,0 +1,39 @@
+From ed1e0795acde8349ab18b631c545f56e5a3acb9d Mon Sep 17 00:00:00 2001
+From: Stephen Seo <seo.disparate@gmail.com>
+Date: Wed, 29 Nov 2023 20:07:10 +0900
+Subject: [PATCH] libobs: Fence off unnecessary code due to FFmpeg v6.1 changes
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+This commit prevents obs from using the "fenced" code if using FFmpeg
+6.1, since in FFmpeg commit [1] the "side_data" is added to
+`AVCodecParameters`, and therefore the existing/following
+`avcodec_parameters_copy(...)` will account for the metadata.
+
+[1]: avcodec/codec_par: add side data to AVCodecParameters
+https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe
+---
+ libobs/media-io/media-remux.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libobs/media-io/media-remux.c b/libobs/media-io/media-remux.c
+index 7d5eead200012..827d4e59b18ed 100644
+--- a/libobs/media-io/media-remux.c
++++ b/libobs/media-io/media-remux.c
+@@ -91,6 +91,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename)
+ 			return false;
+ 		}
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ #if FF_API_BUFFER_SIZE_T
+ 		int content_size;
+ #else
+@@ -125,6 +126,7 @@ static inline bool init_output(media_remux_job_t job, const char *out_filename)
+ 				       mastering_size);
+ 			}
+ 		}
++#endif
+ 
+ 		ret = avcodec_parameters_copy(out_stream->codecpar,
+ 					      in_stream->codecpar);
diff --git a/multimedia/obs-studio/patches/4_6d0381f.patch b/multimedia/obs-studio/patches/4_6d0381f.patch
new file mode 100644
index 0000000000..a386f53a3b
--- /dev/null
+++ b/multimedia/obs-studio/patches/4_6d0381f.patch
@@ -0,0 +1,157 @@
+From 6d0381f98ce0a5624901b0042d624ea972a10c2b Mon Sep 17 00:00:00 2001
+From: Stephen Seo <seo.disparate@gmail.com>
+Date: Wed, 29 Nov 2023 20:09:08 +0900
+Subject: [PATCH] obs-ffmpeg: Use new side-data FFmpeg 6.1 API
+
+Fixes for using FFmpeg 6.1 due to deprecations. Uses `#if` macros to
+allow builds for using older versions of FFmpeg.
+
+This commit replaces usage of `av_stream_add_side_data(...)` with
+`av_packet_side_data_add(...)`, as the former was deprecated in favor of
+the latter.
+
+The FFmpeg commit that deprecated `av_stream_add_side_data(...)` is [1].
+
+The FFmpeg commit that introduced `av_packet_side_data_add(...)` is [2].
+
+Note that the deprecation commit is after the new API function. The
+commit in between [3] appears to be changes that migrates to the usage
+of the new API function.
+
+[1]: avformat/avformat: use the side data from AVStream.codecpar
+https://github.com/FFmpeg/FFmpeg/commit/5432d2aacad5fa7420fe2d9369ed061d521e92d6
+
+[2]: avcodec/packet: add generic side data helpers
+https://github.com/FFmpeg/FFmpeg/commit/74279227dd28d01b447edb8e617a545982171c2c
+
+[3]: avcodec/codec_par: add side data to AVCodecParameters
+https://github.com/FFmpeg/FFmpeg/commit/21d7cc6fa9a26e94965fa71b25655d07568450fe
+---
+ plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 16 ++++++++++++++++
+ plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c     | 16 ++++++++++++++++
+ plugins/obs-ffmpeg/obs-ffmpeg-output.c     | 16 ++++++++++++++++
+ 3 files changed, 48 insertions(+)
+
+diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+index 740b60e5bf46e..8fb84aa7c4e0b 100644
+--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
+@@ -498,9 +498,17 @@ static void create_video_stream(struct ffmpeg_mux *ffm)
+ 			av_content_light_metadata_alloc(&content_size);
+ 		content->MaxCLL = max_luminance;
+ 		content->MaxFALL = max_luminance;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(ffm->video_stream,
+ 					AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
+ 					(uint8_t *)content, content_size);
++#else
++		av_packet_side_data_add(
++			&ffm->video_stream->codecpar->coded_side_data,
++			&ffm->video_stream->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content,
++			content_size, 0);
++#endif
+ 
+ 		AVMasteringDisplayMetadata *const mastering =
+ 			av_mastering_display_metadata_alloc();
+@@ -516,10 +524,18 @@ static void create_video_stream(struct ffmpeg_mux *ffm)
+ 		mastering->max_luminance = av_make_q(max_luminance, 1);
+ 		mastering->has_primaries = 1;
+ 		mastering->has_luminance = 1;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(ffm->video_stream,
+ 					AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
+ 					(uint8_t *)mastering,
+ 					sizeof(*mastering));
++#else
++		av_packet_side_data_add(
++			&ffm->video_stream->codecpar->coded_side_data,
++			&ffm->video_stream->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
++			(uint8_t *)mastering, sizeof(*mastering), 0);
++#endif
+ 	}
+ 
+ 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
+index f33ee77365274..a56dd91bcc38e 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
++++ b/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c
+@@ -168,9 +168,17 @@ static bool create_video_stream(struct ffmpeg_output *stream,
+ 			av_content_light_metadata_alloc(&content_size);
+ 		content->MaxCLL = hdr_nominal_peak_level;
+ 		content->MaxFALL = hdr_nominal_peak_level;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
+ 					(uint8_t *)content, content_size);
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content,
++			content_size, 0);
++#endif
+ 
+ 		AVMasteringDisplayMetadata *const mastering =
+ 			av_mastering_display_metadata_alloc();
+@@ -186,10 +194,18 @@ static bool create_video_stream(struct ffmpeg_output *stream,
+ 		mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1);
+ 		mastering->has_primaries = 1;
+ 		mastering->has_luminance = 1;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
+ 					(uint8_t *)mastering,
+ 					sizeof(*mastering));
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
++			(uint8_t *)mastering, sizeof(*mastering), 0);
++#endif
+ 	}
+ 	context = avcodec_alloc_context3(NULL);
+ 	context->codec_type = codec->type;
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c
+index ec02b59cda9d8..c7786153392e5 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c
++++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c
+@@ -213,9 +213,17 @@ static bool create_video_stream(struct ffmpeg_data *data)
+ 			av_content_light_metadata_alloc(&content_size);
+ 		content->MaxCLL = hdr_nominal_peak_level;
+ 		content->MaxFALL = hdr_nominal_peak_level;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
+ 					(uint8_t *)content, content_size);
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_CONTENT_LIGHT_LEVEL, (uint8_t *)content,
++			content_size, 0);
++#endif
+ 
+ 		AVMasteringDisplayMetadata *const mastering =
+ 			av_mastering_display_metadata_alloc();
+@@ -231,10 +239,18 @@ static bool create_video_stream(struct ffmpeg_data *data)
+ 		mastering->max_luminance = av_make_q(hdr_nominal_peak_level, 1);
+ 		mastering->has_primaries = 1;
+ 		mastering->has_luminance = 1;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
+ 		av_stream_add_side_data(data->video,
+ 					AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
+ 					(uint8_t *)mastering,
+ 					sizeof(*mastering));
++#else
++		av_packet_side_data_add(
++			&data->video->codecpar->coded_side_data,
++			&data->video->codecpar->nb_coded_side_data,
++			AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
++			(uint8_t *)mastering, sizeof(*mastering), 0);
++#endif
+ 	}
+ 
+ 	closest_format = data->config.format;
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.10.patch
deleted file mode 100644
index ea737c8b09..0000000000
--- a/multimedia/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/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg-0.11.patch
deleted file mode 100644
index 871d073fea..0000000000
--- a/multimedia/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/multimedia/transcode/transcode-1.1.7-ffmpeg.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg.patch
deleted file mode 100644
index be7a6cbaeb..0000000000
--- a/multimedia/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/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch
deleted file mode 100644
index 9a770a6a0d..0000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg2.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Fix build with ffmpeg-2.0.
-Fix segfaults introduced by wrong usage of the av_dict API.
-Fix forgotten parts in the libav9 patch.
-
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
-     int lmin;
-     int lmax;
-     int me_method;
-+    int luma_elim_threshold;
-+    int chroma_elim_threshold;
-+    int quantizer_noise_shaping;
- 
-     /* same as above for flags */
-     struct {
-@@ -114,7 +117,7 @@ struct tclavcprivatedata_ {
- 
-     AVFrame ff_venc_frame;
-     AVCodecContext ff_vcontext;
--    AVDictionary ** ff_opts;
-+    AVDictionary * ff_opts;
- 
-     AVCodec *ff_vcodec;
- 
-@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou
-     TC_CODEC_ERROR
- };
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static const enum CodecID tc_lavc_internal_codecs[] = {
-     CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4,
-     CODEC_ID_H263I, CODEC_ID_H263P,
-@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern
-     CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3,
-     CODEC_ID_NONE
- };
-+#else
-+static const enum AVCodecID tc_lavc_internal_codecs[] = {
-+    AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4,
-+    AV_CODEC_ID_H263I, AV_CODEC_ID_H263P,
-+    AV_CODEC_ID_H264,
-+    AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2,
-+    AV_CODEC_ID_RV10,
-+    AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1,
-+    AV_CODEC_ID_DVVIDEO,
-+    AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG,
-+    AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3,
-+    AV_CODEC_ID_NONE
-+};
-+#endif
- 
- static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR };
- 
-@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL
- static void tc_lavc_config_defaults(TCLavcPrivateData *pd)
- {
-     /* first of all reinitialize lavc data */
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-     avcodec_get_context_defaults(&pd->ff_vcontext);
-+#else
-+    avcodec_get_context_defaults3(&pd->ff_vcontext, NULL);
-+#endif
- 
-     pd->confdata.thread_count = 1;
- 
-@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.mpeg_quant              = 0;
-     pd->ff_vcontext.rc_initial_cplx         = 0.0;
-     pd->ff_vcontext.rc_qsquish              = 1.0;
--    pd->ff_vcontext.luma_elim_threshold     = 0;
--    pd->ff_vcontext.chroma_elim_threshold   = 0;
-+    pd->confdata.luma_elim_threshold     = 0;
-+    pd->confdata.chroma_elim_threshold   = 0;
-     pd->ff_vcontext.strict_std_compliance   = 0;
-     pd->ff_vcontext.dct_algo                = FF_DCT_AUTO;
-     pd->ff_vcontext.idct_algo               = FF_IDCT_AUTO;
-@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa
-     pd->ff_vcontext.intra_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.inter_quant_bias        = FF_DEFAULT_QUANT_BIAS;
-     pd->ff_vcontext.noise_reduction         = 0;
--    pd->ff_vcontext.quantizer_noise_shaping = 0;
-+    pd->confdata.quantizer_noise_shaping = 0;
-     pd->ff_vcontext.flags                   = 0;
- }
- 
-@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC
- 
-     pd->ff_vcontext.flags = 0;
-     SET_FLAG(pd, mv0);
--    SET_FLAG(pd, cbp);
-     SET_FLAG(pd, qpel);
-     SET_FLAG(pd, naq);
-     SET_FLAG(pd, ilme);
-@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC
-         pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
-     }
-     if (pd->confdata.flags.alt) {
--        av_dict_set(pd->ff_opts, "alternate_scan", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
-     }
-     if (pd->confdata.flags.vdpart) {
--        av_dict_set(pd->ff_opts, "data_partitioning", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0);
-     }
-     if (pd->confdata.flags.umv) {
--        av_dict_set(pd->ff_opts, "umv", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "umv", "1", 0);
-     }
-     if (pd->confdata.flags.aiv) {
--        av_dict_set(pd->ff_opts, "aiv", "1", 0);
-+        av_dict_set(&(pd->ff_opts), "aiv", "1", 0);
-     }
-+    if (pd->confdata.flags.cbp) {
-+    	av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
-+    }
-+
-+    char buf[1024];
-+#define set_dict_opt(val, opt) \
-+    snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
-+    av_dict_set(&(pd->ff_opts), opt, buf, 0)
-+
-+    set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
-+    set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
-+    set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
- }
- 
- #undef SET_FLAG
-@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri
-         { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
-         //  { "vrc_init_occupancy",   }, // not yet supported
-         { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
--        { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
--        { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+        { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-+        { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
-         { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 },
-         { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
-@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri
-         { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
-         { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
-         { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
--        { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-+        { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
-         { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-         { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
-     
-         { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
--        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD },
-+        { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
-         { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
-         { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
-@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns
- 
-     pd = self->userdata;
- 
-+    pd->ff_opts = NULL;
-+
-     pd->flush_flag = vob->encoder_flush;
-     
-     /* FIXME: move into core? */
-@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts);
-+    ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts));
-     TC_UNLOCK_LIBAVCODEC;
- 
-     if (ret < 0) {
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -122,7 +122,7 @@ static uint8_t             *img_buffer =
- static AVFrame             *lavc_convert_frame = NULL;
- 
- static AVCodec             *lavc_venc_codec = NULL;
--static AVDictionary        **lavc_venc_opts = NULL;
-+static AVDictionary        *lavc_venc_opts = NULL;
- static AVFrame             *lavc_venc_frame = NULL;
- static AVCodecContext      *lavc_venc_context;
- static avi_t               *avifile = NULL;
-@@ -486,7 +486,7 @@ MOD_init
- 		            codec->name, codec->fourCC, codec->comments);
-     }
- 
--    lavc_venc_context = avcodec_alloc_context();
-+    lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
-     lavc_venc_frame   = avcodec_alloc_frame();
- 
-     lavc_convert_frame= avcodec_alloc_frame();
-@@ -838,8 +838,13 @@ MOD_init
-     lavc_venc_context->rc_strategy        = lavc_param_vrc_strategy;
-     lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
-     lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
--    lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold;
--    lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold;
-+
-+    char buf[1024];
-+#define set_dict_opt(val, opt) \
-+	snprintf(buf, sizeof(buf), "%i", val); \
-+	av_dict_set(&lavc_venc_opts, opt, buf, 0)
-+    set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
-+    set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
-     lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     if (lavc_param_packet_size)
-@@ -870,7 +875,7 @@ MOD_init
-     lavc_venc_context->context_model      = lavc_param_context;
-     lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-     lavc_venc_context->noise_reduction    = lavc_param_noise_reduction;
--    lavc_venc_context->inter_threshold    = lavc_param_inter_threshold;
-+    set_dict_opt(lavc_param_inter_threshold, "inter_threshold");
-     lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision;
-     lavc_venc_context->skip_top           = lavc_param_skip_top;
-     lavc_venc_context->skip_bottom        = lavc_param_skip_bottom;
-@@ -1066,9 +1071,11 @@ MOD_init
-     lavc_venc_context->flags |= lavc_param_trunc;
-     lavc_venc_context->flags |= lavc_param_aic;
-     lavc_venc_context->flags |= lavc_param_v4mv;
--    lavc_venc_context->flags |= lavc_param_cbp;
-+    if(lavc_param_cbp)
-+    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0);
-     lavc_venc_context->flags |= lavc_param_mv0;
--    lavc_venc_context->flags |= lavc_param_qp_rd;
-+    if(lavc_param_qp_rd)
-+    	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
-     lavc_venc_context->flags |= lavc_param_ilme;
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
-     lavc_venc_context->flags |= lavc_param_trell;
-@@ -1238,29 +1245,29 @@ MOD_init
- 	}
- 
-     if (lavc_param_scan_offset) {
--      av_dict_set(lavc_venc_opts, "scan_offset", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0);
-     }
- 
-     if (lavc_param_ss) {
--      av_dict_set(lavc_venc_opts, "structured_slices", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0);
-     }
- 
-     if (lavc_param_alt) {
--      av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0);
-     }
- 
-     if (lavc_param_umv) {
--      av_dict_set(lavc_venc_opts, "umv", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "umv", "1", 0);
-     }
- 
-     if (lavc_param_data_partitioning) {
--      av_dict_set(lavc_venc_opts, "vdpart", "1", 0);
-+      av_dict_set(&lavc_venc_opts, "vdpart", "1", 0);
-     }
- 
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts);
-+    ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
-@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
-     {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-     {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
-     {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
--    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD},
-+    {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
--    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-+    {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
-     {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-Index: transcode-1.1.7/export/aud_aux.c
-===================================================================
---- transcode-1.1.7.orig/export/aud_aux.c
-+++ transcode-1.1.7/export/aud_aux.c
-@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
- 
-     switch (o_codec) {
-       case   0x50:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         codeid = CODEC_ID_MP2;
-+#else
-+        codeid = AV_CODEC_ID_MP2;
-+#endif
-         break;
-       case 0x2000:
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         codeid = CODEC_ID_AC3;
-+#else
-+        codeid = AV_CODEC_ID_AC3;
-+#endif
-         break;
-       default:
-         tc_warn("cannot init ffmpeg with %x", o_codec);
-@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
- 
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
--    avcodec_get_context_defaults(&mpa_ctx);
-+    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
- #if LIBAVCODEC_VERSION_MAJOR < 53
-     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
- #else
-@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(&mpa_ctx, mpa_codec);
-+    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
-@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec)
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
--                (codeid == CODEC_ID_MP2) ?"mpa" :"ac3");
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-+                (codeid == CODEC_ID_MP2)
-+#else
-+                (codeid == AV_CODEC_ID_MP2)
-+#endif
-+                ?"mpa" :"ac3");
-         return(TC_EXPORT_ERROR);
-     }
- 
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -58,6 +58,7 @@ struct ffmpeg_codec {
- };
- 
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-     {"MP41", "DIV1", ""}},
-@@ -106,6 +107,56 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
-     {"Y42B", ""}},
-   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+    {"MP41", "DIV1", ""}},
-+  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+    {"MP42", "DIV2", ""}},
-+  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video",
-+    {"MPG1", ""}},
-+  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+    {"DVSD", ""}},
-+  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+    {"WMV1", ""}},
-+  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+    {"WMV2", ""}},
-+  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+    {"HFYU", ""}},
-+  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+    {"I263", ""}},
-+  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+    {"H263", "U263", "VIV1", ""}},
-+  {AV_CODEC_ID_H264, TC_CODEC_H264, "h264",
-+    {"H264", "h264", "X264", "x264", "avc1", ""}},
-+  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+    {"RV10", "RV13", ""}},
-+  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+    {"SVQ1", ""}},
-+  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+    {"SVQ3", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+    {"MPG2", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video",
-+    {"MPG2", ""}},
-+  {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1",
-+    {"ASV1", ""}},
-+  {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2",
-+    {"ASV2", ""}},
-+  {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1",
-+    {"FFV1", ""}},
-+  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw",
-+    {"I420", "IYUV", ""}},
-+  {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw",
-+    {"Y42B", ""}},
-+  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
- 
- #define BUFFER_SIZE SIZE_RGB_FRAME
- 
-@@ -302,7 +302,7 @@ do_avi:
- 
-     // Set these to the expected values so that ffmpeg's decoder can
-     // properly detect interlaced input.
--    lavc_dec_context = avcodec_alloc_context();
-+    lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec);
-     if (lavc_dec_context == NULL) {
-       tc_log_error(MOD_NAME, "Could not allocate enough memory.");
-       return TC_IMPORT_ERROR;
-@@ -324,6 +375,7 @@ do_avi:
-     // XXX: some codecs need extra data
-     switch (codec->id)
-     {
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       case CODEC_ID_MJPEG: extra_data_size  = 28; break;
-       case CODEC_ID_LJPEG: extra_data_size  = 28; break;
-       case CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-@@ -331,6 +383,15 @@ do_avi:
-       case CODEC_ID_ASV2: extra_data_size = 8; break;
-       case CODEC_ID_WMV1: extra_data_size = 4; break;
-       case CODEC_ID_WMV2: extra_data_size = 4; break;
-+#else
-+      case AV_CODEC_ID_MJPEG: extra_data_size  = 28; break;
-+      case AV_CODEC_ID_LJPEG: extra_data_size  = 28; break;
-+      case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break;
-+      case AV_CODEC_ID_ASV1: extra_data_size = 8; break;
-+      case AV_CODEC_ID_ASV2: extra_data_size = 8; break;
-+      case AV_CODEC_ID_WMV1: extra_data_size = 4; break;
-+      case AV_CODEC_ID_WMV2: extra_data_size = 4; break;
-+#endif
-       default: extra_data_size = 0; break;
-     }
- 
-@@ -344,7 +344,7 @@ do_avi:
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(lavc_dec_context, lavc_dec_codec);
-+    ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-       tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.",
-@@ -360,7 +421,11 @@ do_avi:
-         frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim);
- 
- 	// we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-         if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+        if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- 	  enable_levels_filter();
-         }
-         break;
-@@ -434,7 +499,11 @@ do_dv:
-       }
- 
-       // we adapt the color space
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       if(codec->id == CODEC_ID_MJPEG) {
-+#else
-+      if(codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
-         enable_levels_filter();
-       }
- 
-@@ -504,13 +573,25 @@ MOD_decode {
-       int bkey = 0;
- 
-       // check for keyframes
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       if (codec->id == CODEC_ID_MSMPEG4V3) {
-+#else
-+      if (codec->id == AV_CODEC_ID_MSMPEG4V3) {
-+#endif
- 	if (divx3_is_key(buffer)) bkey = 1;
-       }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       else if (codec->id == CODEC_ID_MPEG4) {
-+#else
-+      else if (codec->id == AV_CODEC_ID_MPEG4) {
-+#endif
- 	if (mpeg4_is_key(buffer, bytes_read)) bkey = 1;
-       }
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-       else if (codec->id == CODEC_ID_MJPEG) {
-+#else
-+      else if (codec->id == AV_CODEC_ID_MJPEG) {
-+#endif
- 	bkey = 1;
-       }
- 
---- a/import/decode_lavc.c
-+++ b/import/decode_lavc.c
-@@ -57,6 +57,7 @@ struct ffmpeg_codec {
- };
- 
- // fourCC to ID mapping taken from MPlayer's codecs.conf
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-     {"MP41", "DIV1", ""}},
-@@ -91,6 +92,42 @@ static struct ffmpeg_codec ffmpeg_codecs[] = {
-   {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-     {"MPG2", ""}},
-   {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#else
-+static struct ffmpeg_codec ffmpeg_codecs[] = {
-+  {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41",
-+    {"MP41", "DIV1", ""}},
-+  {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42",
-+    {"MP42", "DIV2", ""}},
-+  {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4",
-+    {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}},
-+  {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4",
-+    {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}},
-+  {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg",
-+    {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}},
-+  {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video",
-+    {"MPG1", ""}},
-+  {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo",
-+    {"DVSD", ""}},
-+  {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1",
-+    {"WMV1", ""}},
-+  {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2",
-+    {"WMV2", ""}},
-+  {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu",
-+    {"HFYU", ""}},
-+  {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i",
-+    {"I263", ""}},
-+  {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p",
-+    {"H263", "U263", "VIV1", ""}},
-+  {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10",
-+    {"RV10", "RV13", ""}},
-+  {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1",
-+    {"SVQ1", ""}},
-+  {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3",
-+    {"SVQ3", ""}},
-+  {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video",
-+    {"MPG2", ""}},
-+  {0, TC_CODEC_UNKNOWN, NULL, {""}}};
-+#endif
- 
- 
- static struct ffmpeg_codec *find_ffmpeg_codec_id(unsigned int transcode_id)
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch
deleted file mode 100644
index 57a91774ab..0000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg24.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=520190
-
-Index: transcode-1.1.7/import/probe_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/probe_ffmpeg.c
-+++ transcode-1.1.7/import/probe_ffmpeg.c
-@@ -120,7 +120,11 @@ void probe_ffmpeg(info_t *ipipe)
- 
-     translate_info(lavf_dmx_context, ipipe->probe_info);
- 
-+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
-+    avformat_close_input(&lavf_dmx_context);
-+#else
-     av_close_input_file(lavf_dmx_context);
-+#endif
-     return;
- }
- 
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch
deleted file mode 100644
index 7901fc3cc3..0000000000
--- a/multimedia/transcode/transcode-1.1.7-ffmpeg29.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
-@@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
-                                      vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
--                    PIX_FMT_YUV420P,
-+                    AV_PIX_FMT_YUV420P,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
- }
- 
-@@ -247,7 +247,7 @@ static void pre_encode_video_yuv420p_huf
-                     IMG_YUV_DEFAULT,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV422P,
-+                   AV_PIX_FMT_YUV422P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(src, IMG_YUV_DEFAULT,
-                   pd->ff_venc_frame.data, IMG_YUV422P,
-@@ -263,7 +263,7 @@ static void pre_encode_video_yuv422p(TCL
-                     IMG_YUV422P,
-                     pd->ff_vcontext.width, pd->ff_vcontext.height);
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV420P,
-+                   AV_PIX_FMT_YUV420P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(src, IMG_YUV422P,
-                   pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -275,7 +275,7 @@ static void pre_encode_video_yuv422p_huf
-                                              vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, vframe->video_buf,
--                   PIX_FMT_YUV422P,
-+                   AV_PIX_FMT_YUV422P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
- 
- }
-@@ -285,7 +285,7 @@ static void pre_encode_video_rgb24(TCLav
-                                    vframe_list_t *vframe)
- {
-     avpicture_fill((AVPicture *)&pd->ff_venc_frame, pd->vframe_buf->video_buf,
--                   PIX_FMT_YUV420P,
-+                   AV_PIX_FMT_YUV420P,
-                    pd->ff_vcontext.width, pd->ff_vcontext.height);
-     ac_imgconvert(&vframe->video_buf, IMG_RGB_DEFAULT,
-                   pd->ff_venc_frame.data, IMG_YUV420P,
-@@ -610,21 +610,21 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
-       case CODEC_YUV:
-         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
-             pd->tc_pix_fmt = TC_CODEC_YUV422P;
--            pd->ff_vcontext.pix_fmt = PIX_FMT_YUV422P;
-+            pd->ff_vcontext.pix_fmt = AV_PIX_FMT_YUV422P;
-             pd->pre_encode_video = pre_encode_video_yuv420p_huffyuv;
-         } else {
-             pd->tc_pix_fmt = TC_CODEC_YUV420P;
-             pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                       ? PIX_FMT_YUVJ420P
--                                       : PIX_FMT_YUV420P;
-+                                       ? AV_PIX_FMT_YUVJ420P
-+                                       : AV_PIX_FMT_YUV420P;
-             pd->pre_encode_video = pre_encode_video_yuv420p;
-         }
-         break;
-       case CODEC_YUV422:
-         pd->tc_pix_fmt = TC_CODEC_YUV422P;
-         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                   ? PIX_FMT_YUVJ422P
--                                   : PIX_FMT_YUV422P;
-+                                   ? AV_PIX_FMT_YUVJ422P
-+                                   : AV_PIX_FMT_YUV422P;
-         if (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV) {
-             pd->pre_encode_video = pre_encode_video_yuv422p_huffyuv;
-         } else {
-@@ -634,10 +634,10 @@ static int tc_lavc_set_pix_fmt(TCLavcPri
-       case CODEC_RGB:
-         pd->tc_pix_fmt = TC_CODEC_RGB;
-         pd->ff_vcontext.pix_fmt = (TC_VCODEC_ID(pd) == TC_CODEC_HUFFYUV)
--                                        ? PIX_FMT_YUV422P
-+                                        ? AV_PIX_FMT_YUV422P
-                                         : (TC_VCODEC_ID(pd) == TC_CODEC_MJPEG) 
--                                           ? PIX_FMT_YUVJ420P
--                                           : PIX_FMT_YUV420P;
-+                                           ? AV_PIX_FMT_YUVJ420P
-+                                           : AV_PIX_FMT_YUV420P;
-         pd->pre_encode_video = pre_encode_video_rgb24;
-         break;
-       default:
-@@ -1390,7 +1390,7 @@ static int tc_lavc_configure(TCModuleIns
-     /* FIXME: move into core? */
-     TC_INIT_LIBAVCODEC;
- 
--    avcodec_get_frame_defaults(&pd->ff_venc_frame);
-+    av_frame_unref(&pd->ff_venc_frame);
-     /*
-      * auxiliary config data needs to be blanked too
-      * before any other operation
-@@ -1523,6 +1523,8 @@ static int tc_lavc_encode_video(TCModule
-                                 vframe_list_t *outframe)
- {
-     TCLavcPrivateData *pd = NULL;
-+    AVPacket pkt;
-+    int ret, got_packet = 0;
- 
-     TC_MODULE_SELF_CHECK(self, "encode_video");
- 
-@@ -1537,12 +1539,15 @@ static int tc_lavc_encode_video(TCModule
- 
-     pd->pre_encode_video(pd, inframe); 
- 
-+    av_init_packet(&pkt);
-+    pkt.data = outframe->video_buf;
-+    pkt.size = inframe->video_size;
-+
-     TC_LOCK_LIBAVCODEC;
--    outframe->video_len = avcodec_encode_video(&pd->ff_vcontext,
--                                               outframe->video_buf,
--                                               inframe->video_size,
--                                               &pd->ff_venc_frame);
-+    ret = avcodec_encode_video2(&pd->ff_vcontext,   &pkt,
-+    				&pd->ff_venc_frame, &got_packet);
-     TC_UNLOCK_LIBAVCODEC;
-+    outframe->video_len = ret ? ret : pkt.size;
- 
-     if (outframe->video_len < 0) {
-         tc_log_warn(MOD_NAME, "encoder error: size (%i)",
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -250,9 +250,9 @@ int opt_default(const char *opt, const c
-     for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
- 		/* GLUE: +if */
- 		if (type == AVMEDIA_TYPE_VIDEO) {
--        const AVOption *o2 = av_find_opt(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
--        if(o2)
--            ret = av_set_string3(avcodec_opts[type], opt, arg, 1, &o);
-+        o = av_opt_find(avcodec_opts[0], opt, NULL, opt_types[type], opt_types[type]);
-+        if(o)
-+            ret = av_opt_set(avcodec_opts[type], opt, arg, 0);
- 		/* GLUE: +if */
- 		}
-     }
-@@ -267,7 +267,10 @@ int opt_default(const char *opt, const c
-         if(opt[0] == 'a')
-             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_AUDIO], opt+1, arg, 1, &o);
-         else */ if(opt[0] == 'v')
--            ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 1, &o);
-+	{
-+	    o = av_opt_find(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, NULL, 0, 0);
-+            ret = av_opt_set(avcodec_opts[AVMEDIA_TYPE_VIDEO], opt+1, arg, 0);
-+	}
- 		/* GLUE: disabling
-         else if(opt[0] == 's')
-             ret = av_set_string3(avcodec_opts[AVMEDIA_TYPE_SUBTITLE], opt+1, arg, 1, &o);
-@@ -487,10 +490,10 @@ MOD_init
-     }
- 
-     lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec);
--    lavc_venc_frame   = avcodec_alloc_frame();
-+    lavc_venc_frame   = av_frame_alloc();
- 
--    lavc_convert_frame= avcodec_alloc_frame();
--    size = avpicture_get_size(PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
-+    lavc_convert_frame= av_frame_alloc();
-+    size = avpicture_get_size(AV_PIX_FMT_RGB24, vob->ex_v_width, vob->ex_v_height);
-     enc_buffer = tc_malloc(size);
- 
-     if (lavc_venc_context == NULL || !enc_buffer || !lavc_convert_frame) {
-@@ -1114,7 +1117,7 @@ MOD_init
-     lavc_venc_context->prediction_method = lavc_param_prediction_method;
- 
-     if(is_huffyuv)
--        lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+        lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
-     else
-     {
-         switch(pix_fmt)
-@@ -1123,18 +1126,18 @@ MOD_init
-             case CODEC_RGB:
-             {
-                 if(is_mjpeg)
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ420P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ420P;
-                 else
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUV420P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV420P;
-                 break;
-             }
- 
-             case CODEC_YUV422:
-             {
-                 if(is_mjpeg)
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUVJ422P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUVJ422P;
-                 else
--                    lavc_venc_context->pix_fmt = PIX_FMT_YUV422P;
-+                    lavc_venc_context->pix_fmt = AV_PIX_FMT_YUV422P;
-                 break;
-             }
- 
-@@ -1596,6 +1599,8 @@ MOD_encode
- 
-   int out_size;
-   const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
-+  AVPacket pkt;
-+  int ret, got_packet = 0;
- 
-   if (param->flag == TC_VIDEO) {
- 
-@@ -1620,7 +1625,7 @@ MOD_encode
- 	        	YUV_INIT_PLANES(src, param->buffer, IMG_YUV_DEFAULT,
- 			                	lavc_venc_context->width, lavc_venc_context->height);
-                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                               PIX_FMT_YUV422P, lavc_venc_context->width,
-+                               AV_PIX_FMT_YUV422P, lavc_venc_context->width,
-                                lavc_venc_context->height);
-         		/* FIXME: can't use tcv_convert (see decode_lavc.c) */
-                 ac_imgconvert(src, IMG_YUV_DEFAULT,
-@@ -1650,7 +1655,7 @@ MOD_encode
- 		                		lavc_venc_context->width,
-                                 lavc_venc_context->height);
-                 avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                               PIX_FMT_YUV420P, lavc_venc_context->width,
-+                               AV_PIX_FMT_YUV420P, lavc_venc_context->width,
-                                lavc_venc_context->height);
-                 ac_imgconvert(src, IMG_YUV422P,
-                               lavc_venc_frame->data, IMG_YUV420P,
-@@ -1661,7 +1666,7 @@ MOD_encode
- 
-         case CODEC_RGB:
-             avpicture_fill((AVPicture *)lavc_venc_frame, img_buffer,
--                           PIX_FMT_YUV420P, lavc_venc_context->width,
-+                           AV_PIX_FMT_YUV420P, lavc_venc_context->width,
-                            lavc_venc_context->height);
-     	    ac_imgconvert(&param->buffer, IMG_RGB_DEFAULT,
-                               lavc_venc_frame->data, IMG_YUV420P,
-@@ -1674,13 +1679,17 @@ MOD_encode
-               return TC_EXPORT_ERROR;
-     }
- 
-+    av_init_packet(&pkt);
-+    pkt.data = enc_buffer;
-+    pkt.size = size;
- 
-     TC_LOCK_LIBAVCODEC;
--    out_size = avcodec_encode_video(lavc_venc_context,
--                                    enc_buffer, size,
--                                    lavc_venc_frame);
-+    ret = avcodec_encode_video2(lavc_venc_context, &pkt,
-+                                    lavc_venc_frame, &got_packet);
-     TC_UNLOCK_LIBAVCODEC;
- 
-+    out_size = ret ? ret : pkt.size;
-+
-     if (out_size < 0) {
-       tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
-       return TC_EXPORT_ERROR;
-Index: transcode-1.1.7/import/decode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/import/decode_lavc.c
-+++ transcode-1.1.7/import/decode_lavc.c
-@@ -327,8 +327,8 @@ void decode_lavc(decode_t *decode)
- 
-       // Convert avcodec image to the requested YUV or RGB format
-       switch (lavc_dec_context->pix_fmt) {
--	case PIX_FMT_YUVJ420P:
--	case PIX_FMT_YUV420P:
-+	case AV_PIX_FMT_YUVJ420P:
-+	case AV_PIX_FMT_YUV420P:
- 	    // Remove "dead space" at right edge of planes, if any
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
-@@ -352,7 +352,7 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUV411P:
-+	case AV_PIX_FMT_YUV411P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -371,8 +371,8 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUVJ422P:
--	case PIX_FMT_YUV422P:
-+	case AV_PIX_FMT_YUVJ422P:
-+	case AV_PIX_FMT_YUV422P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-@@ -391,8 +391,8 @@ void decode_lavc(decode_t *decode)
- 			  pix_fmt==TC_CODEC_YUV420P ? IMG_YUV420P : IMG_RGB_DEFAULT,
- 			  lavc_dec_context->width, lavc_dec_context->height);
- 	    break;
--	case PIX_FMT_YUVJ444P:
--	case PIX_FMT_YUV444P:
-+	case AV_PIX_FMT_YUVJ444P:
-+	case AV_PIX_FMT_YUV444P:
- 	    if (picture.linesize[0] != lavc_dec_context->width) {
- 		int y;
- 		for (y = 0; y < lavc_dec_context->height; y++) {
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -661,8 +661,8 @@ retry:
- 
-     // Convert avcodec image to our internal YUV or RGB format
-     switch (lavc_dec_context->pix_fmt) {
--      case PIX_FMT_YUVJ420P:
--      case PIX_FMT_YUV420P:
-+      case AV_PIX_FMT_YUVJ420P:
-+      case AV_PIX_FMT_YUV420P:
-         src_fmt = IMG_YUV420P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -693,7 +693,7 @@ retry:
- 	}
-         break;
- 
--      case PIX_FMT_YUV411P:
-+      case AV_PIX_FMT_YUV411P:
-         src_fmt = IMG_YUV411P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -721,8 +721,8 @@ retry:
-         }
-         break;
- 
--      case PIX_FMT_YUVJ422P:
--      case PIX_FMT_YUV422P:
-+      case AV_PIX_FMT_YUVJ422P:
-+      case AV_PIX_FMT_YUV422P:
-         src_fmt = IMG_YUV422P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
-@@ -750,8 +750,8 @@ retry:
-         }
- 	break;
- 
--      case PIX_FMT_YUVJ444P:
--      case PIX_FMT_YUV444P:
-+      case AV_PIX_FMT_YUVJ444P:
-+      case AV_PIX_FMT_YUV444P:
-         src_fmt = IMG_YUV444P;
-         YUV_INIT_PLANES(src_planes, frame, src_fmt,
-                         lavc_dec_context->width, lavc_dec_context->height);
diff --git a/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch b/multimedia/transcode/transcode-1.1.7-ffmpeg4.patch
deleted file mode 100644
index 9ad765e1c3..0000000000
--- a/multimedia/transcode/transcode-1.1.7-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/multimedia/transcode/transcode-1.1.7-libav-10.patch b/multimedia/transcode/transcode-1.1.7-libav-10.patch
deleted file mode 100644
index 1f4a24039d..0000000000
--- a/multimedia/transcode/transcode-1.1.7-libav-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-fix building w/libav-10
-
-https://wiki.libav.org/Migration/10
-
---- a/filter/filter_resample.c
-+++ b/filter/filter_resample.c
-@@ -37,6 +37,7 @@
- #include "libtc/optstr.h"
- #include "libtc/tcavcodec.h"
- #include "libtc/tcmodule-plugin.h"
-+#include <libavresample/avresample.h>
- 
- 
- typedef struct {
-@@ -45,7 +46,7 @@ typedef struct {
- 
-     int bytes_per_sample;
- 
--    ReSampleContext *resample_ctx;
-+    AVAudioResampleContext *resample_ctx;
- } ResamplePrivateData;
- 
- static const char resample_help[] = ""
---- a/import/probe_ffmpeg.c
-+++ b/import/probe_ffmpeg.c
-@@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info)
-             info->bitrate = st->codec->bit_rate / 1000;
-             info->width = st->codec->width;
-             info->height = st->codec->height;
--            if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) {
--                info->fps = av_q2d(st->r_frame_rate);
-+            if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) {
-+                info->fps = av_q2d(st->avg_frame_rate);
-             } else {
-                 /* watch out here */
-                 info->fps = 1.0/av_q2d(st->codec->time_base);
diff --git a/multimedia/transcode/transcode-1.1.7-libav-9.patch b/multimedia/transcode/transcode-1.1.7-libav-9.patch
deleted file mode 100644
index 3989d3d83a..0000000000
--- a/multimedia/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/multimedia/transcode/transcode-1.1.7-preset-force.patch b/multimedia/transcode/transcode-1.1.7-preset-force.patch
deleted file mode 100644
index 0d1da8b4f6..0000000000
--- a/multimedia/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/multimedia/transcode/transcode-1.1.7-preset-free.patch b/multimedia/transcode/transcode-1.1.7-preset-free.patch
deleted file mode 100644
index 00494b94ba..0000000000
--- a/multimedia/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/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild
index d9a7341eb2..3d220fb5e0 100644
--- a/multimedia/transcode/transcode.SlackBuild
+++ b/multimedia/transcode/transcode.SlackBuild
@@ -79,19 +79,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix building with newer ffmpeg
-patch -p0 -i $CWD/transcode-1.1.7-ffmpeg.patch
-patch -p0 -i $CWD/transcode-1.1.7-ffmpeg-0.10.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg-0.11.patch
-patch -p1 -i $CWD/transcode-1.1.7-preset-free.patch
-patch -p0 -i $CWD/transcode-1.1.7-libav-9.patch
-patch -p1 -i $CWD/transcode-1.1.7-libav-10.patch
-patch -p1 -i $CWD/transcode-1.1.7-preset-force.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg2.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg24.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg29.patch
-patch -p1 -i $CWD/transcode-1.1.7-ffmpeg4.patch
 # Fix building with imagemagick 7.x
+# 2024: this is actually not true anymore and imagemagick support had to be disabled, sorry folks
 patch -p1 -i $CWD/transcode-1.1.7-imagemagick7.patch
 patch -p1 -i $CWD/transcode-1.1.7-gcc10.patch
 patch -p1 -i $CWD/transcode-1.1.7-glibc-2.32.patch
@@ -100,6 +89,7 @@ autoreconf -vif
 
 export MAGICKCORE_QUANTUM_DEPTH=32
 
+# unfortunately ffmpeg >= 5.x breaks compatibility and no patches are available...
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -109,6 +99,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --mandir=/usr/man \
+  --disable-ffmpeg \
+  --enable-alsa \
   --enable-alsa \
   --enable-v4l \
   --enable-libv4lconvert \
@@ -131,7 +123,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-nuv \
   --enable-lzo \
   --enable-libpostproc \
-  --enable-imagemagick \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/multimedia/tvheadend/tvheadend.SlackBuild b/multimedia/tvheadend/tvheadend.SlackBuild
index fd60f65751..23df71bf9d 100644
--- a/multimedia/tvheadend/tvheadend.SlackBuild
+++ b/multimedia/tvheadend/tvheadend.SlackBuild
@@ -108,6 +108,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-libtheora_static \
   --disable-libvorbis_static \
   --disable-libfdkaac_static \
+  --disable-libav \
   --python=python3 \
   --disable-pcloud_cache \
   --nowerror \