From nobody Fri Mar 31 00:02:21 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PngT93wtwz42Z3b; Fri, 31 Mar 2023 00:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PngT92xFhz4Q99; Fri, 31 Mar 2023 00:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWZZqAftDgA5Bq0qK2K4yuXTdAp5L0YPK89XQRA16o4=; b=jPy3+oTGc9E6gJqulJH6DxAVpv88DjFyFwHQV3Nbw2VWwu4Vyuv0WVzpKyluVwM36J2IxZ RS4KgsDLmgrj9bJyxn2XQHzFhrxJ3bBhRRp82CCcR0lH/uv+0Glrj6qXUa2WFwOaRKVD1S bQ1RHUHFU2RweehMSnXBq8iQQ6Mzziyb92EwAEYlACJL77XKjnfWoVrlDdjE4a17HU5DEs Lx9LRawfBYaD5bYf9PCqKK6lN0Fw/fEZ/iLAzP1i4tfbQ9MIDKkOKifjydIYBpfpS71nMO SsjKKkDXYAjzzKbUmLjeu8KtlcCMOC0w+gXOlmfTWd0ApUH9BV3G3oz8UCM/hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWZZqAftDgA5Bq0qK2K4yuXTdAp5L0YPK89XQRA16o4=; b=QHDKrvNN13tT/wjEf+F9XOvtqvbsMq4U+dBUs/Jw+jfsPhQ5fzj18kw/HVVbyCWdJSLYxZ EpuqlBa47oWUKT+nJVwchmNw0vAaBU1OGuqx6cH8wnSbypELdo3LKOeeuz/qqzsgy9LsXh lSTkzbMSfbEJ2QPwl3FKx0Pec6FEr2cQuuIrRKX7QCjqQj2AoNI8j3FnA0Fn0uzN8eVzzX WTkDpTvzf7nUHLUCsMUACJnQKmU2kX0PqQjX6KYe5iEpq327v9nkwXL26DqovE3wBQ1lGS GPWPnyrGW3+MmpxL0gJmPoPZwmljut7/TYUQ1zfVIZRx+8QM4z09Bq4ogMcOGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680220941; a=rsa-sha256; cv=none; b=noTvSGJ1OyIerjPVcNuUIkMbTeo//RBoc9T3rGIxGs3AGUsheX4YOLM9yeyaBSNdmK1Rbk L4sEbHbuQH6MHvHasJuUjVdEMKqhKflBnKifce76v79aBUUinGsHRJKoKofKGfwdsBI/b2 ltS4H6zf+XQX4VVBvQTkX6AGNqu3WbFE+ClwGAuoFChcB9tTfCOLY6FjAyCu1cSpPi18AP EwFms9GSOhjhUFuqrCdZK90ARaLhFOEsIbaClROpmfs2NIwNuNhK2awTAyI5U2N6o+hjie D2Z6KaiQcnYSKdk30W9IMyw9YYiQhULdAaBGmLZZUsGWfY8TmjKIKUWWVEOy2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PngT921nCzWgl; Fri, 31 Mar 2023 00:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V02L7k018573; Fri, 31 Mar 2023 00:02:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V02Lcl018572; Fri, 31 Mar 2023 00:02:21 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:02:21 GMT Message-Id: <202303310002.32V02Lcl018572@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 450bb37cf300 - main - multimedia/transcode: Remove expired port: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 450bb37cf300a850f3c5825bbe79860558cbe3f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=450bb37cf300a850f3c5825bbe79860558cbe3f7 commit 450bb37cf300a850f3c5825bbe79860558cbe3f7 Author: Muhammad Moinur Rahman AuthorDate: 2023-03-29 11:59:08 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-03-30 23:59:51 +0000 multimedia/transcode: Remove expired port: 2023-03-31 multimedia/transcode: abandoned by upstream and does not build --- MOVED | 1 + multimedia/Makefile | 1 - multimedia/transcode/Makefile | 167 ------- multimedia/transcode/distinfo | 3 - multimedia/transcode/files/patch-configure | 29 -- multimedia/transcode/files/patch-ffmpeg0-10 | 13 - multimedia/transcode/files/patch-ffmpeg0-11 | 299 ------------ multimedia/transcode/files/patch-ffmpeg2 | 328 -------------- multimedia/transcode/files/patch-ffmpeg29 | 352 --------------- multimedia/transcode/files/patch-ffmpeg3 | 213 --------- multimedia/transcode/files/patch-ffmpeg4 | 502 --------------------- .../files/patch-filter_yuvdenoise_motion.c | 61 --- multimedia/transcode/files/patch-import-v4l | 30 -- .../transcode/files/patch-import_Makefile.in | 11 - .../transcode/files/patch-import__probe_ffmpeg.c | 11 - .../transcode/files/patch-import_demux__pass.c | 11 - .../transcode/files/patch-import_extract__ac3.c | 11 - .../transcode/files/patch-import_extract__mp3.c | 11 - .../transcode/files/patch-import_extract__pcm.c | 11 - multimedia/transcode/files/patch-libav-10.patch | 32 -- .../transcode/files/patch-libtc-tc_functions.c | 33 -- multimedia/transcode/files/patch-livav-9.patch | 31 -- multimedia/transcode/pkg-descr | 19 - multimedia/transcode/pkg-plist | 130 ------ 24 files changed, 1 insertion(+), 2309 deletions(-) diff --git a/MOVED b/MOVED index e4ac965b6d60..eb2f108f6be6 100644 --- a/MOVED +++ b/MOVED @@ -17885,3 +17885,4 @@ www/horde-trean||2023-03-31|Has expired: Requires php74 devel/horde-content||2023-03-31|Has expired: Requires php74 devel/horde-timeobjects||2023-03-31|Has expired: Requires php74 www/horde-base||2023-03-31|Has expired: Requires php74 +multimedia/transcode||2023-03-31|Has expired: abandoned by upstream and does not build diff --git a/multimedia/Makefile b/multimedia/Makefile index c96054d7dd4f..253b592033c1 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -376,7 +376,6 @@ SUBDIR += tivodecode SUBDIR += totem SUBDIR += totem-pl-parser - SUBDIR += transcode SUBDIR += tvheadend SUBDIR += ustreamer SUBDIR += uvg266 diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile deleted file mode 100644 index ce66354b5428..000000000000 --- a/multimedia/transcode/Makefile +++ /dev/null @@ -1,167 +0,0 @@ -PORTNAME= transcode -PORTVERSION= 1.1.7 -PORTREVISION= 51 -CATEGORIES= multimedia -#MASTER_SITES= https://bitbucket.org/france/transcode-tcforge/downloads/ - -MAINTAINER= se@FreeBSD.org -COMMENT= Text-console utility for video stream processing -WWW= https://www.transcoding.org/ - -LICENSE= GPLv2 - -DEPRECATED= abandoned by upstream and does not build -EXPIRATION_DATE= 2023-03-31 -BROKEN= depends on removed libav audio resample functions - -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg - -USES= gmake libtool pkgconfig tar:bzip2 gettext-runtime -USE_GITHUB= yes -GH_ACCOUNT= wyyrepo -GH_TAGNAME= 474090a -USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-oss -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME \ - XVID X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \ - FAAC LIBXML2 MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV V4L -OPTIONS_DEFAULT= LAME DVDREAD JPEG ICONV -BKTR_DESC= Bktr capture card support -POSTPROC_DESC= Libpostproc support -DVDREAD_DESC= Libdvdread support - -X11_USES= xorg -X11_USE= xorg=xv,xaw,xpm,sm,ice,xext,x11,xt -X11_CONFIGURE_WITH= x - -MPEG2_LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2 -MPEG2_CONFIGURE_ENABLE= libmpeg2 libmpeg2convert - -BKTR_CONFIGURE_ENABLE= bktr - -POSTPROC_CONFIGURE_ENABLE= libpostproc - -FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 -FREETYPE_CONFIGURE_ENABLE= freetype2 - -LAME_LIB_DEPENDS= libmp3lame.so:audio/lame -LAME_CONFIGURE_ENABLE= lame -LAME_CONFIGURE_ON= --with-lame-prefix=${LOCALBASE} - -XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid -XVID_CONFIGURE_ENABLE= xvid -XVID_CONFIGURE_ON= --with-xvid-prefix=${LOCALBASE} - -X264_LIB_DEPENDS= libx264.so:multimedia/libx264 -X264_CONFIGURE_ENABLE= x264 - -OGG_LIB_DEPENDS= libogg.so:audio/libogg -OGG_CONFIGURE_ENABLE= ogg - -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis -VORBIS_CONFIGURE_ENABLE= vorbis - -THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora -THEORA_CONFIGURE_ENABLE= theora - -DVDREAD_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread -DVDREAD_CONFIGURE_ENABLE= libdvdread -DVDREAD_CONFIGURE_ON= --with-libdvdread-prefix=${LOCALBASE} - -DV_LIB_DEPENDS= libdv.so:multimedia/libdv -DV_CONFIGURE_ENABLE= libdv - -QUICKTIME_LIB_DEPENDS= libquicktime.so:multimedia/libquicktime -QUICKTIME_CONFIGURE_ENABLE= libquicktime - -LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 -LZO_CONFIGURE_ENABLE= lzo -LZO_CONFIGURE_ON= --with-lzo-prefix=${LOCALBASE} --with-lzo-includes=${LOCALBASE} - -A52_LIB_DEPENDS= liba52.so:audio/liba52 -A52_CONFIGURE_ENABLE= a52 -A52_CONFIGURE_ON= --with-a52-prefix=${LOCALBASE} - -FAAC_LIB_DEPENDS= libfaac.so:audio/faac -FAAC_CONFIGURE_ENABLE= faac -FAAC_CONFIGURE_ON= --with-faac-prefix=${LOCALBASE} - -LIBXML2_USES= gnome -LIBXML2_USE= GNOME=libxml2 -LIBXML2_CONFIGURE_ENABLE= libxml2 - -MJPEGTOOLS_LIB_DEPENDS= liblavjpeg.so:multimedia/mjpegtools -MJPEGTOOLS_CONFIGURE_ENABLE= mjpegtools - -SDL_USES= sdl -SDL_USE= SDL=sdl -SDL_CONFIGURE_ENABLE= sdl - -IMAGEMAGICK_USES= magick:6 -IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick -IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick-prefix=${LOCALBASE} - -JPEG_USES= jpeg -JPEG_CONFIGURE_ENABLE= libjpeg -JPEG_CONFIGURE_ON= --with-libjpeg-prefix=${LOCALBASE} - -ICONV_USES= iconv -ICONV_CONFIGURE_ENABLE= iconv -ICONV_CONFIGURE_ON= --with-iconv-prefix=${ICONV_PREFIX} - -V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -V4L_CONFIGURE_ENABLE= v4l - -.include - -LDFLAGS_i386+= -Wl,-z,notext - -.if empty(ICONV_LIB) -CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ - ac_cv_lib_iconv_libiconv_open=no -.endif - -post-extract: - @${RM} ${WRKSRC}/import/v4l/videodev* - @${CHMOD} +x ${WRKSRC}/configure - -post-patch: - @${REINPLACE_CMD} -E -e 's|loff_t|uint64_t|' ${WRKSRC}/avilib/avidump.c - @${REINPLACE_CMD} -E -e 's|> ${TMPPLIST}) - -.include diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo deleted file mode 100644 index d9c39f4d6238..000000000000 --- a/multimedia/transcode/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1675976910 -SHA256 (wyyrepo-transcode-1.1.7-474090a_GH0.tar.gz) = 028c9a2dd9070c556cc056530177ca78020fe0c96ada81d95aaa23a28a6c3f65 -SIZE (wyyrepo-transcode-1.1.7-474090a_GH0.tar.gz) = 2584504 diff --git a/multimedia/transcode/files/patch-configure b/multimedia/transcode/files/patch-configure deleted file mode 100644 index 7e7d99850279..000000000000 --- a/multimedia/transcode/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig 2011-11-19 17:50:37.000000000 +0100 -+++ configure 2014-01-17 22:18:16.637476520 +0100 -@@ -5073,7 +5073,7 @@ - ;; - esac - fi --PATH_TO_AWK=$ac_cv_path_PATH_TO_AWK -+PATH_TO_AWK=$ac_cv_prog_AWK - if test -n "$PATH_TO_AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_AWK" >&5 - $as_echo "$PATH_TO_AWK" >&6; } -@@ -26196,7 +26196,7 @@ - for l in $a52_ll ; do - case $l in - -L*) lpaths="$lpaths $l" ;; -- -l*) test x"$l" != x"-la52" && xlibs="$xlibs $l" ;; -+ -l*) test x"$l" != x"-la52 -L%%LOCALBASE%%/lib -lm" && xlibs="$xlibs $l" ;; - *) xlf="$xlf $l" ;; - esac - done -@@ -26249,7 +26249,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_a52_a52_init" >&5 - $as_echo "$ac_cv_lib_a52_a52_init" >&6; } - if test "x$ac_cv_lib_a52_a52_init" = xyes; then : -- A52_LIBS="$a52_ll -la52 $A52_EXTRA_LIBS" -+ A52_LIBS="$a52_ll -la52 -L%%LOCALBASE%%/lib -lm $A52_EXTRA_LIBS" - else - - this_pkg_err="yes" diff --git a/multimedia/transcode/files/patch-ffmpeg0-10 b/multimedia/transcode/files/patch-ffmpeg0-10 deleted file mode 100644 index 83e11846f1c6..000000000000 --- a/multimedia/transcode/files/patch-ffmpeg0-10 +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/files/patch-ffmpeg0-11 b/multimedia/transcode/files/patch-ffmpeg0-11 deleted file mode 100644 index 74ac7eec348c..000000000000 --- a/multimedia/transcode/files/patch-ffmpeg0-11 +++ /dev/null @@ -1,299 +0,0 @@ -diff -urN encode/encode_lavc.c.orig encode/encode_lavc.c ---- encode/encode_lavc.c.orig 2011-11-19 08:50:27.000000000 -0800 -+++ 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 export/export_ffmpeg.c.orig export/export_ffmpeg.c ---- export/export_ffmpeg.c.orig 2011-11-19 08:50:27.000000000 -0800 -+++ 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 -+#include - #include - #include - -@@ -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 export/ffmpeg_cfg.c.orig export/ffmpeg_cfg.c ---- export/ffmpeg_cfg.c.orig 2011-11-19 08:50:27.000000000 -0800 -+++ 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 import/decode_lavc.c.orig import/decode_lavc.c ---- import/decode_lavc.c.orig 2011-11-19 08:50:27.000000000 -0800 -+++ 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 import/import_ffmpeg.c.orig import/import_ffmpeg.c ---- import/import_ffmpeg.c.orig 2011-11-19 08:50:27.000000000 -0800 -+++ 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 import/probe_ffmpeg.c.orig import/probe_ffmpeg.c ---- import/probe_ffmpeg.c.orig 2011-11-19 08:50:27.000000000 -0800 -+++ 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 libtc/tcavcodec.h.orig libtc/tcavcodec.h ---- libtc/tcavcodec.h.orig 2011-11-19 08:50:27.000000000 -0800 -+++ 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/files/patch-ffmpeg2 b/multimedia/transcode/files/patch-ffmpeg2 deleted file mode 100644 index bbeef488a702..000000000000 --- a/multimedia/transcode/files/patch-ffmpeg2 +++ /dev/null @@ -1,328 +0,0 @@ -Index: encode/encode_lavc.c -=================================================================== ---- encode/encode_lavc.c.orig -+++ 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: export/export_ffmpeg.c -=================================================================== ---- export/export_ffmpeg.c.orig -+++ 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: export/ffmpeg_cfg.c -=================================================================== ---- export/ffmpeg_cfg.c.orig -+++ 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: export/aud_aux.c -=================================================================== ---- export/aud_aux.c.orig -+++ export/aud_aux.c -@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- -- avcodec_get_context_defaults(&mpa_ctx); -+ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); - #if LIBAVCODEC_VERSION_MAJOR < 53 - mpa_ctx.codec_type = CODEC_TYPE_AUDIO; - #else -@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v - //-- open codec -- - //---------------- - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(&mpa_ctx, mpa_codec); -+ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -Index: import/import_ffmpeg.c -=================================================================== ---- import/import_ffmpeg.c.orig -+++ import/import_ffmpeg.c -@@ -302,7 +302,7 @@ do_avi: - - // Set these to the expected values so that ffmpeg's decoder can - // properly detect interlaced input. -- lavc_dec_context = avcodec_alloc_context(); -+ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); - if (lavc_dec_context == NULL) { - tc_log_error(MOD_NAME, "Could not allocate enough memory."); - return TC_IMPORT_ERROR; -@@ -344,7 +344,7 @@ do_avi: - } - - TC_LOCK_LIBAVCODEC; -- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); -+ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", diff --git a/multimedia/transcode/files/patch-ffmpeg29 b/multimedia/transcode/files/patch-ffmpeg29 deleted file mode 100644 index 3b13530ea0cd..000000000000 --- a/multimedia/transcode/files/patch-ffmpeg29 +++ /dev/null @@ -1,352 +0,0 @@ -Index: encode/encode_lavc.c -=================================================================== ---- encode/encode_lavc.c.orig -+++ 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, *** 1514 LINES SKIPPED ***