diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-03-29 06:59:08 -0500 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-03-30 18:59:51 -0500 |
| commit | 450bb37cf300a850f3c5825bbe79860558cbe3f7 (patch) | |
| tree | d7e493508af713bc07a94ea945ab66be80870212 | |
| parent | www/horde-base: Remove expired port: (diff) | |
multimedia/transcode: Remove expired port:12.3-last
2023-03-31 multimedia/transcode: abandoned by upstream and does not build
24 files changed, 1 insertions, 2309 deletions
@@ -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 <bsd.port.pre.mk> - -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|<SDL/|<|' ${WRKSRC}/filter/preview/display.h - @${REINPLACE_CMD} -e '/^static.*lrint/s|static ||' ${WRKSRC}/filter/filter_modfps.c - - @${REINPLACE_CMD} -E -e 's|(-la52)|\1 ${LIBA52_DEP_LIBS}|g ; \ - s|FFMPEG_VERSION|LIBAVCODEC_IDENT|g ; \ - s|-lMagick|-lMagickCore|g' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - - @${REINPLACE_CMD} -E -e 's|-ldl||g' ${WRKSRC}/configure - @${REINPLACE_CMD} -E -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -E -e 's|WRKSRC|${WRKSRC}|g' ${WRKSRC}/export/Makefile.in - @${REINPLACE_CMD} -E -e 's|<quicktime/|<lqt/|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/export/export_mov.c \ - ${WRKSRC}/import/decode_mov.c \ - ${WRKSRC}/import/import_mov.c \ - ${WRKSRC}/import/probe_mov.c - -post-patch-LZO-on: - @${REINPLACE_CMD} -e 's|%%NUV%%|nuv|' ${WRKSRC}/import/Makefile.in - -post-patch-LZO-off: - @${REINPLACE_CMD} -e 's|%%NUV%%||' ${WRKSRC}/import/Makefile.in - -post-patch-OPTIMIZED_CFLAGS-off: - @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \ - -e 's|-O[236]|${CFLAGS}|' - -post-stage: - @(cd ${STAGEDIR}${PREFIX} && \ - ${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST}) - -.include <bsd.port.post.mk> 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 <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 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, -+ 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: export/export_ffmpeg.c -=================================================================== ---- export/export_ffmpeg.c.orig -+++ 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(¶m->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: import/decode_lavc.c -=================================================================== ---- import/decode_lavc.c.orig -+++ 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: import/import_ffmpeg.c -=================================================================== ---- import/import_ffmpeg.c.orig -+++ 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/files/patch-ffmpeg3 b/multimedia/transcode/files/patch-ffmpeg3 deleted file mode 100644 index 366fbffd1954..000000000000 --- a/multimedia/transcode/files/patch-ffmpeg3 +++ /dev/null @@ -1,213 +0,0 @@ ---- export/aud_aux.c.orig 2016-02-16 23:38:40.162690789 +0000 -+++ export/aud_aux.c 2016-02-16 23:40:50.335488439 +0000 -@@ -326,10 +326,10 @@ - - switch (o_codec) { - case 0x50: -- codeid = CODEC_ID_MP2; -+ codeid = AV_CODEC_ID_MP2; - break; - case 0x2000: -- codeid = CODEC_ID_AC3; -+ codeid = AV_CODEC_ID_AC3; - break; - default: - tc_warn("cannot init ffmpeg with %x", o_codec); -@@ -363,7 +363,7 @@ - TC_UNLOCK_LIBAVCODEC; - if (ret < 0) { - tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", -- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); -+ (codeid == AV_CODEC_ID_MP2) ?"mpa" :"ac3"); - return(TC_EXPORT_ERROR); - } - ---- import/import_ffmpeg.c.orig 2016-02-16 23:52:36.192589648 +0000 -+++ import/import_ffmpeg.c 2016-02-16 23:54:38.728757498 +0000 -@@ -59,51 +59,51 @@ - - // fourCC to ID mapping taken from MPlayer's codecs.conf - static struct ffmpeg_codec ffmpeg_codecs[] = { -- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", - {"MP42", "DIV2", ""}}, -- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", - {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", - {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", - {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPG1, "mpeg1video", - {"MPG1", ""}}, -- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", - {"DVSD", ""}}, -- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", - {"WMV1", ""}}, -- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", - {"WMV2", ""}}, -- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", - {"HFYU", ""}}, -- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", - {"I263", ""}}, -- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", - {"H263", "U263", "VIV1", ""}}, -- {CODEC_ID_H264, TC_CODEC_H264, "h264", -+ {AV_CODEC_ID_H264, TC_CODEC_H264, "h264", - {"H264", "h264", "X264", "x264", "avc1", ""}}, -- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", - {"RV10", "RV13", ""}}, -- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", - {"SVQ1", ""}}, -- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", - {"SVQ3", ""}}, -- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", - {"MPG2", ""}}, -- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG, "mpeg2video", - {"MPG2", ""}}, -- {CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", -+ {AV_CODEC_ID_ASV1, TC_CODEC_ASV1, "asv1", - {"ASV1", ""}}, -- {CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", -+ {AV_CODEC_ID_ASV2, TC_CODEC_ASV2, "asv2", - {"ASV2", ""}}, -- {CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", -+ {AV_CODEC_ID_FFV1, TC_CODEC_FFV1, "ffv1", - {"FFV1", ""}}, -- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV420P, "raw", - {"I420", "IYUV", ""}}, -- {CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", -+ {AV_CODEC_ID_RAWVIDEO, TC_CODEC_YUV422P, "raw", - {"Y42B", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; - -@@ -324,13 +324,13 @@ - // XXX: some codecs need extra data - switch (codec->id) - { -- case CODEC_ID_MJPEG: extra_data_size = 28; break; -- case CODEC_ID_LJPEG: extra_data_size = 28; break; -- case CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -- case CODEC_ID_ASV1: extra_data_size = 8; break; -- case CODEC_ID_ASV2: extra_data_size = 8; break; -- case CODEC_ID_WMV1: extra_data_size = 4; break; -- case CODEC_ID_WMV2: extra_data_size = 4; break; -+ case AV_CODEC_ID_MJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_LJPEG: extra_data_size = 28; break; -+ case AV_CODEC_ID_HUFFYUV: extra_data_size = 1000; break; -+ case AV_CODEC_ID_ASV1: extra_data_size = 8; break; -+ case AV_CODEC_ID_ASV2: extra_data_size = 8; break; -+ case AV_CODEC_ID_WMV1: extra_data_size = 4; break; -+ case AV_CODEC_ID_WMV2: extra_data_size = 4; break; - default: extra_data_size = 0; break; - } - -@@ -360,7 +360,7 @@ - frame_size = x_dim*y_dim + 2*UV_PLANE_SIZE(IMG_YUV_DEFAULT,x_dim,y_dim); - - // we adapt the color space -- if(codec->id == CODEC_ID_MJPEG) { -+ if(codec->id == AV_CODEC_ID_MJPEG) { - enable_levels_filter(); - } - break; -@@ -434,7 +434,7 @@ - } - - // we adapt the color space -- if(codec->id == CODEC_ID_MJPEG) { -+ if(codec->id == AV_CODEC_ID_MJPEG) { - enable_levels_filter(); - } - -@@ -504,13 +504,13 @@ - int bkey = 0; - - // check for keyframes -- if (codec->id == CODEC_ID_MSMPEG4V3) { -+ if (codec->id == AV_CODEC_ID_MSMPEG4V3) { - if (divx3_is_key(buffer)) bkey = 1; - } -- else if (codec->id == CODEC_ID_MPEG4) { -+ else if (codec->id == AV_CODEC_ID_MPEG4) { - if (mpeg4_is_key(buffer, bytes_read)) bkey = 1; - } -- else if (codec->id == CODEC_ID_MJPEG) { -+ else if (codec->id == AV_CODEC_ID_MJPEG) { - bkey = 1; - } - ---- import/decode_lavc.c.orig 2016-02-16 23:56:35.488282034 +0000 -+++ import/decode_lavc.c 2016-02-16 23:56:55.201535074 +0000 -@@ -58,37 +58,37 @@ - - // fourCC to ID mapping taken from MPlayer's codecs.conf - static struct ffmpeg_codec ffmpeg_codecs[] = { -- {CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", -+ {AV_CODEC_ID_MSMPEG4V1, TC_CODEC_ERROR, "mp41", - {"MP41", "DIV1", ""}}, -- {CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", -+ {AV_CODEC_ID_MSMPEG4V2, TC_CODEC_MP42, "mp42", - {"MP42", "DIV2", ""}}, -- {CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", -+ {AV_CODEC_ID_MSMPEG4V3, TC_CODEC_DIVX3, "msmpeg4", - {"DIV3", "DIV5", "AP41", "MPG3", "MP43", ""}}, -- {CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", -+ {AV_CODEC_ID_MPEG4, TC_CODEC_DIVX4, "mpeg4", - {"DIVX", "XVID", "MP4S", "M4S2", "MP4V", "UMP4", "DX50", ""}}, -- {CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", -+ {AV_CODEC_ID_MJPEG, TC_CODEC_MJPEG, "mjpeg", - {"MJPG", "AVRN", "AVDJ", "JPEG", "MJPA", "JFIF", ""}}, -- {CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", -+ {AV_CODEC_ID_MPEG1VIDEO, TC_CODEC_MPEG1VIDEO, "mpeg1video", - {"MPG1", ""}}, -- {CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", -+ {AV_CODEC_ID_DVVIDEO, TC_CODEC_DV, "dvvideo", - {"DVSD", ""}}, -- {CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", -+ {AV_CODEC_ID_WMV1, TC_CODEC_WMV1, "wmv1", - {"WMV1", ""}}, -- {CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", -+ {AV_CODEC_ID_WMV2, TC_CODEC_WMV2, "wmv2", - {"WMV2", ""}}, -- {CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", -+ {AV_CODEC_ID_HUFFYUV, TC_CODEC_HUFFYUV, "hfyu", - {"HFYU", ""}}, -- {CODEC_ID_H263I, TC_CODEC_H263I, "h263i", -+ {AV_CODEC_ID_H263I, TC_CODEC_H263I, "h263i", - {"I263", ""}}, -- {CODEC_ID_H263P, TC_CODEC_H263P, "h263p", -+ {AV_CODEC_ID_H263P, TC_CODEC_H263P, "h263p", - {"H263", "U263", "VIV1", ""}}, -- {CODEC_ID_RV10, TC_CODEC_RV10, "rv10", -+ {AV_CODEC_ID_RV10, TC_CODEC_RV10, "rv10", - {"RV10", "RV13", ""}}, -- {CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", -+ {AV_CODEC_ID_SVQ1, TC_CODEC_SVQ1, "svq1", - {"SVQ1", ""}}, -- {CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", -+ {AV_CODEC_ID_SVQ3, TC_CODEC_SVQ3, "svq3", - {"SVQ3", ""}}, -- {CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", -+ {AV_CODEC_ID_MPEG2VIDEO, TC_CODEC_MPEG2, "mpeg2video", - {"MPG2", ""}}, - {0, TC_CODEC_UNKNOWN, NULL, {""}}}; - diff --git a/multimedia/transcode/files/patch-ffmpeg4 b/multimedia/transcode/files/patch-ffmpeg4 deleted file mode 100644 index c3ccbf258c1f..000000000000 --- a/multimedia/transcode/files/patch-ffmpeg4 +++ /dev/null @@ -1,502 +0,0 @@ -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-video/transcode/files/ffmpeg4.patch?id=ac771a5dab7c - ---- encode/encode_lavc.c -+++ 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 */ ---- export/export_ffmpeg.c -+++ 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")) { ---- export/ffmpeg_cfg.c -+++ 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}, ---- import/import_ffmpeg.c -+++ 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/files/patch-filter_yuvdenoise_motion.c b/multimedia/transcode/files/patch-filter_yuvdenoise_motion.c deleted file mode 100644 index f618da1fb270..000000000000 --- a/multimedia/transcode/files/patch-filter_yuvdenoise_motion.c +++ /dev/null @@ -1,61 +0,0 @@ ---- filter/yuvdenoise/motion.c.orig 2016-09-18 16:54:49 UTC -+++ filter/yuvdenoise/motion.c -@@ -350,32 +350,32 @@ calc_SAD_half_mmx (uint8_t * ref, uint8_ - - __asm__ __volatile__ - ( -- " pxor %%mm0 , %%mm0; /* clear mm0 */" -- " pcmpeqw %%mm6 , %%mm6; /* Build 7f7f7f7f7f7f7f in a register */" -- " psrlw $9 , %%mm6; /* */" -- " packuswb %%mm6 , %%mm6; /* */" -- " ; /* */" -- " .rept 8 ; /* */" -- " movq (%%esi), %%mm1; /* 8 Pixels from filtered frame to mm1 */" -- " movq (%%edi), %%mm2; /* 8 Pixels from filtered frame to mm2 (displaced) */" -- " movq (%%eax), %%mm3; /* reference to mm3 */" -- " psrlq $1 , %%mm1; /* average source pixels */" -- " psrlq $1 , %%mm2; /* shift right by one (divide by two) */" -- " pand %%mm6 , %%mm1; /* kill downshifted bits */" -- " pand %%mm6 , %%mm2; /* kill downshifted bits */" -- " paddusw %%mm2 , %%mm1; /* add up ... */" -- -- " movq %%mm3 , %%mm4; /* copy reference to mm4 */" -- " psubusb %%mm1 , %%mm3; /* positive differences between mm2 and mm1 */" -- " psubusb %%mm4 , %%mm1; /* positive differences between mm1 and mm3 */" -- " paddusb %%mm3 , %%mm1; /* mm1 now contains abs(mm1-mm2) */" -- " paddusw %%mm1 , %%mm0; /* add result to mm0 */" -- " addl %%ecx , %%esi; /* add framewidth to frameaddress */" -- " addl %%ecx , %%edi; /* add framewidth to frameaddress */" -- " addl %%ecx , %%ecx; /* add framewidth to frameaddress */" -- " .endr ; /* */" -- " /* */" -- " movq %%mm0 , %0 ; /* make mm0 available to gcc ... */" -+ " pxor %%mm0 , %%mm0; /* clear mm0 */\n" -+ " pcmpeqw %%mm6 , %%mm6; /* Build 7f7f7f7f7f7f7f in a register */\n" -+ " psrlw $9 , %%mm6; /* */\n" -+ " packuswb %%mm6 , %%mm6; /* */\n" -+ " ; /* */\n" -+ " .rept 8 ; /* */\n" -+ " movq (%%esi), %%mm1; /* 8 Pixels from filtered frame to mm1 */\n" -+ " movq (%%edi), %%mm2; /* 8 Pixels from filtered frame to mm2 (displaced) */\n" -+ " movq (%%eax), %%mm3; /* reference to mm3 */\n" -+ " psrlq $1 , %%mm1; /* average source pixels */\n" -+ " psrlq $1 , %%mm2; /* shift right by one (divide by two) */\n" -+ " pand %%mm6 , %%mm1; /* kill downshifted bits */\n" -+ " pand %%mm6 , %%mm2; /* kill downshifted bits */\n" -+ " paddusw %%mm2 , %%mm1; /* add up ... */\n" -+ " /* */\n" -+ " movq %%mm3 , %%mm4; /* copy reference to mm4 */\n" -+ " psubusb %%mm1 , %%mm3; /* positive differences between mm2 and mm1 */\n" -+ " psubusb %%mm4 , %%mm1; /* positive differences between mm1 and mm3 */\n" -+ " paddusb %%mm3 , %%mm1; /* mm1 now contains abs(mm1-mm2) */\n" -+ " paddusw %%mm1 , %%mm0; /* add result to mm0 */\n" -+ " addl %%ecx , %%esi; /* add framewidth to frameaddress */\n" -+ " addl %%ecx , %%edi; /* add framewidth to frameaddress */\n" -+ " addl %%ecx , %%ecx; /* add framewidth to frameaddress */\n" -+ " .endr ; /* */\n" -+ " /* */\n" -+ " movq %%mm0 , %0 ; /* make mm0 available to gcc ... */\n" - :"=g" (a) - :"S" (frm1),"D" (frm2), "a" (ref), "c" (denoiser.frame.w) - ); diff --git a/multimedia/transcode/files/patch-import-v4l b/multimedia/transcode/files/patch-import-v4l deleted file mode 100644 index 7017cc9c1f51..000000000000 --- a/multimedia/transcode/files/patch-import-v4l +++ /dev/null @@ -1,30 +0,0 @@ ---- import/v4l/import_v4l.c.orig 2011-11-19 11:50:27.000000000 -0500 -+++ import/v4l/import_v4l.c 2013-06-10 14:51:01.000000000 -0400 -@@ -29,7 +29,7 @@ - #include <sys/ioctl.h> - #include <sys/mman.h> - --#include "videodev.h" -+#include <linux/videodev.h> - - #define MOD_NAME "import_v4l.so" - #define MOD_VERSION "v0.2.0 (2008-10-26)" ---- import/probe_v4l.c.orig 2011-11-19 11:50:27.000000000 -0500 -+++ import/probe_v4l.c 2013-06-10 14:54:28.000000000 -0400 -@@ -31,14 +31,12 @@ - - #include <sys/ioctl.h> - --#include "v4l/videodev.h" -+#include <linux/videodev.h> - - #if defined(HAVE_LINUX_VIDEODEV2_H) && defined(HAVE_STRUCT_V4L2_BUFFER) - #define _LINUX_TIME_H --#include <linux/videodev2.h> --#else --#include "v4l/videodev2.h" - #endif -+#include <linux/videodev2.h> - - - void probe_v4l(info_t *ipipe) diff --git a/multimedia/transcode/files/patch-import_Makefile.in b/multimedia/transcode/files/patch-import_Makefile.in deleted file mode 100644 index f85ba6bc9ec8..000000000000 --- a/multimedia/transcode/files/patch-import_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- import/Makefile.in.orig 2009-07-18 08:16:35.000000000 -0400 -+++ import/Makefile.in 2009-07-18 11:11:51.000000000 -0400 -@@ -458,7 +458,7 @@ - distclean-recursive maintainer-clean-recursive - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = framegen nuv v4l -+DIST_SUBDIRS = framegen v4l %%NUV%% - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - A52_CFLAGS = @A52_CFLAGS@ - A52_LIBS = @A52_LIBS@ diff --git a/multimedia/transcode/files/patch-import__probe_ffmpeg.c b/multimedia/transcode/files/patch-import__probe_ffmpeg.c deleted file mode 100644 index 9cc46c2c68fb..000000000000 --- a/multimedia/transcode/files/patch-import__probe_ffmpeg.c +++ /dev/null @@ -1,11 +0,0 @@ ---- import/probe_ffmpeg.c.orig 2011-11-19 16:50:27 UTC -+++ import/probe_ffmpeg.c -@@ -120,7 +120,7 @@ - - translate_info(lavf_dmx_context, ipipe->probe_info); - -- av_close_input_file(lavf_dmx_context); -+ avformat_close_input(lavf_dmx_context); - return; - } - diff --git a/multimedia/transcode/files/patch-import_demux__pass.c b/multimedia/transcode/files/patch-import_demux__pass.c deleted file mode 100644 index 64dddc370d37..000000000000 --- a/multimedia/transcode/files/patch-import_demux__pass.c +++ /dev/null @@ -1,11 +0,0 @@ ---- import/demux_pass.c.orig 2011-11-19 16:50:27 UTC -+++ import/demux_pass.c -@@ -32,7 +32,7 @@ - #include "packets.h" - - --int gop, gop_pts, gop_cnt; -+//int gop, gop_pts, gop_cnt; - - /* if you listen carefully, then you can hear the desesperate - * whisper of this code calling for a rewrite. Or for a redesign. diff --git a/multimedia/transcode/files/patch-import_extract__ac3.c b/multimedia/transcode/files/patch-import_extract__ac3.c deleted file mode 100644 index a85d18ed3238..000000000000 --- a/multimedia/transcode/files/patch-import_extract__ac3.c +++ /dev/null @@ -1,11 +0,0 @@ ---- import/extract_ac3.c.orig 2011-11-19 16:50:27 UTC -+++ import/extract_ac3.c -@@ -334,7 +334,7 @@ static void pes_ac3_loop (void) - FILE *fd; - - #define MAX_BUF 4096 --char audio[MAX_BUF]; -+static char audio[MAX_BUF]; - - - /* from ac3scan.c */ diff --git a/multimedia/transcode/files/patch-import_extract__mp3.c b/multimedia/transcode/files/patch-import_extract__mp3.c deleted file mode 100644 index 679b6370d983..000000000000 --- a/multimedia/transcode/files/patch-import_extract__mp3.c +++ /dev/null @@ -1,11 +0,0 @@ ---- import/extract_mp3.c.orig 2011-11-19 16:50:27 UTC -+++ import/extract_mp3.c -@@ -243,7 +243,7 @@ static int mp3scan(int infd, int outfd) - } - - #define MAX_BUF 4096 --char audio[MAX_BUF]; -+static char audio[MAX_BUF]; - - /* ------------------------------------------------------------ - * diff --git a/multimedia/transcode/files/patch-import_extract__pcm.c b/multimedia/transcode/files/patch-import_extract__pcm.c deleted file mode 100644 index 77b1d62c6ca9..000000000000 --- a/multimedia/transcode/files/patch-import_extract__pcm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- import/extract_pcm.c.orig 2011-11-19 16:50:27 UTC -+++ import/extract_pcm.c -@@ -33,7 +33,7 @@ - #include "tc.h" - - #define MAX_BUF 4096 --char audio[MAX_BUF]; -+static char audio[MAX_BUF]; - - #define BUFFER_SIZE 262144 - static uint8_t buffer[BUFFER_SIZE]; diff --git a/multimedia/transcode/files/patch-libav-10.patch b/multimedia/transcode/files/patch-libav-10.patch deleted file mode 100644 index 0286f7365dca..000000000000 --- a/multimedia/transcode/files/patch-libav-10.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- filter/filter_resample.c -+++ 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[] = "" ---- import/probe_ffmpeg.c -+++ 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/files/patch-libtc-tc_functions.c b/multimedia/transcode/files/patch-libtc-tc_functions.c deleted file mode 100644 index 0104d1240ecb..000000000000 --- a/multimedia/transcode/files/patch-libtc-tc_functions.c +++ /dev/null @@ -1,33 +0,0 @@ ---- libtc/tc_functions.c.orig 2008-08-09 17:24:38.000000000 -0400 -+++ libtc/tc_functions.c 2009-02-01 22:13:42.000000000 -0500 -@@ -534,6 +534,15 @@ - /* char device could be several things, depending on system */ - /* *BSD DVD device? v4l? bktr? sunau? */ - if(S_ISCHR(fbuf.st_mode)) { -+#ifdef __FreeBSD__ -+ if (strstr(name, "bktr") || strstr(name, "tuner") || strstr(name, "wbi")) -+ return TC_PROBE_PATH_BKTR; -+ else if (strstr(name, "dsp") || strstr(name, "audio") || strstr(name, "music")) -+ return TC_PROBE_PATH_OSS; -+ else -+ return TC_PROBE_PATH_ABSPATH; -+#endif -+ - switch (major(fbuf.st_rdev)) { - #ifdef OS_BSD - # ifdef __OpenBSD__ -@@ -544,14 +553,6 @@ - case 49: /* bktr */ - return TC_PROBE_PATH_BKTR; - # endif --# ifdef __FreeBSD__ -- case 4: /* acd */ -- return TC_PROBE_PATH_ABSPATH; -- case 229: /* bktr */ -- return TC_PROBE_PATH_BKTR; -- case 0: /* OSS */ -- return TC_PROBE_PATH_OSS; --# endif - default: /* libdvdread uses "raw" disk devices here */ - return TC_PROBE_PATH_ABSPATH; - #else diff --git a/multimedia/transcode/files/patch-livav-9.patch b/multimedia/transcode/files/patch-livav-9.patch deleted file mode 100644 index 9f2d2351f4f0..000000000000 --- a/multimedia/transcode/files/patch-livav-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/pkg-descr b/multimedia/transcode/pkg-descr deleted file mode 100644 index 7a063271c167..000000000000 --- a/multimedia/transcode/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -transcode is a text-console utility for video stream processing, -running on a platform that supports shared libraries and threads. -Decoding and encoding is done by loading modules that are responsible -for feeding transcode with raw video/audio streams (import modules) -and encoding the frames (export modules). - -It supports elementary video and audio frame transformations, -including de-interlacing or fast resizing of video frames and loading -of external filters. A number of modules are included to enable -import of DVDs on-the-fly, MPEG elementary (ES) or program streams -(VOB), MPEG video, Digital Video (DV), YUV4MPEG streams, NuppelVideo -file format and raw or compressed (pass-through) video frames and -export modules for writing DivX;-), OpenDivX, DivX 4.xx or uncompressed -AVI files with MPEG, AC3 (pass-through) or PCM audio. Additional -export modules to write single frames (PPM) or YUV4MPEG streams are -available, as well as an interface import module to the avifile -library. Its modular concept is intended to provide flexibility -and easy user extensibility to include other video/audio codecs or -file types. diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist deleted file mode 100644 index 372010adc8ef..000000000000 --- a/multimedia/transcode/pkg-plist +++ /dev/null @@ -1,130 +0,0 @@ -bin/avifix -bin/aviindex -bin/avimerge -bin/avisplit -bin/avisync -bin/tccat -bin/tcdecode -bin/tcdemux -bin/tcextract -bin/tcmodinfo -bin/tcmp3cut -bin/tcprobe -bin/tcscan -bin/tcxmlcheck -bin/tcxpm2rgb -bin/tcyait -bin/transcode -man/man1/avifix.1.gz -man/man1/aviindex.1.gz -man/man1/avimerge.1.gz -man/man1/avisplit.1.gz -man/man1/avisync.1.gz -man/man1/tccat.1.gz -man/man1/tcdecode.1.gz -man/man1/tcdemux.1.gz -man/man1/tcexport.1.gz -man/man1/tcextract.1.gz -man/man1/tcmodchain.1.gz -man/man1/tcmodinfo.1.gz -man/man1/tcprobe.1.gz -man/man1/tcpvmexportd.1.gz -man/man1/tcscan.1.gz -man/man1/tcxmlcheck.1.gz -man/man1/transcode.1.gz -man/man1/transcode_export.1.gz -man/man1/transcode_filter.1.gz -man/man1/transcode_import.1.gz -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/DV-to-DVD-HOWTO.txt -%%PORTDOCS%%%%DOCSDIR%%/README.Inverse.Telecine.txt -%%PORTDOCS%%%%DOCSDIR%%/README.cluster -%%PORTDOCS%%%%DOCSDIR%%/README.dv -%%PORTDOCS%%%%DOCSDIR%%/README.filter.modfps -%%PORTDOCS%%%%DOCSDIR%%/README.rip -%%PORTDOCS%%%%DOCSDIR%%/README.sync -%%PORTDOCS%%%%DOCSDIR%%/README.vcd -%%PORTDOCS%%%%DOCSDIR%%/README.xvid-credits -%%PORTDOCS%%%%DOCSDIR%%/RELNOTES-0.6.13 -%%PORTDOCS%%%%DOCSDIR%%/RELNOTES-1.1.0 -%%PORTDOCS%%%%DOCSDIR%%/export_ffmpeg.txt -%%PORTDOCS%%%%DOCSDIR%%/export_mp2.txt -%%PORTDOCS%%%%DOCSDIR%%/faq -%%PORTDOCS%%%%DOCSDIR%%/filter-socket.txt -%%PORTDOCS%%%%DOCSDIR%%/filter_dnr.txt -%%PORTDOCS%%%%DOCSDIR%%/filter_logo.txt -%%PORTDOCS%%%%DOCSDIR%%/filter_logoaway.txt -%%PORTDOCS%%%%DOCSDIR%%/filter_text.txt -%%PORTDOCS%%%%DOCSDIR%%/filter_yuvdenoise.txt -%%PORTDOCS%%%%DOCSDIR%%/framerate.txt -%%PORTDOCS%%%%DOCSDIR%%/html/dv.html -%%PORTDOCS%%%%DOCSDIR%%/html/dvd.html -%%PORTDOCS%%%%DOCSDIR%%/html/export_divx.html -%%PORTDOCS%%%%DOCSDIR%%/html/export_divx4.php -%%PORTDOCS%%%%DOCSDIR%%/html/export_divx5.php -%%PORTDOCS%%%%DOCSDIR%%/html/export_fame.php -%%PORTDOCS%%%%DOCSDIR%%/html/export_ogg.php -%%PORTDOCS%%%%DOCSDIR%%/html/export_opendivx.php -%%PORTDOCS%%%%DOCSDIR%%/html/export_xvid.php -%%PORTDOCS%%%%DOCSDIR%%/html/import_avi.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_dv.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_dvd.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_mp3.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg2.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_mpeg3.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_null.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_nuv.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_ogg.php -%%PORTDOCS%%%%DOCSDIR%%/html/import_raw.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_vob.html -%%PORTDOCS%%%%DOCSDIR%%/html/import_yuv4mpeg.html -%%PORTDOCS%%%%DOCSDIR%%/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/html/intro.html -%%PORTDOCS%%%%DOCSDIR%%/html/mes0-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/mes4-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/mes5-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/mes6-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/mes7-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/misc.html -%%PORTDOCS%%%%DOCSDIR%%/html/modules.html -%%PORTDOCS%%%%DOCSDIR%%/html/mpeg.html -%%PORTDOCS%%%%DOCSDIR%%/html/new.png -%%PORTDOCS%%%%DOCSDIR%%/html/other.html -%%PORTDOCS%%%%DOCSDIR%%/html/post.html -%%PORTDOCS%%%%DOCSDIR%%/html/pre.html -%%PORTDOCS%%%%DOCSDIR%%/html/smart.html -%%PORTDOCS%%%%DOCSDIR%%/html/sorry.html -%%PORTDOCS%%%%DOCSDIR%%/html/sub0-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/sub1-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/sub2-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/sub3-00000.png -%%PORTDOCS%%%%DOCSDIR%%/html/subtitles.html -%%PORTDOCS%%%%DOCSDIR%%/html/table.php -%%PORTDOCS%%%%DOCSDIR%%/html/tc.png -%%PORTDOCS%%%%DOCSDIR%%/import-xml.txt -%%PORTDOCS%%%%DOCSDIR%%/import_nvrec.txt -%%PORTDOCS%%%%DOCSDIR%%/import_v4l2.txt -%%PORTDOCS%%%%DOCSDIR%%/import_x11.txt -%%PORTDOCS%%%%DOCSDIR%%/import_yuv.txt -%%PORTDOCS%%%%DOCSDIR%%/pvm3/export_pvm.txt -%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_10x.cfg -%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_11x.cfg -%%PORTDOCS%%%%DOCSDIR%%/pvm3/pvm_config.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/OPTIMIZERS -%%PORTDOCS%%%%DOCSDIR%%/tech/architecture.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/avi_comments.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/clone.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/export-API.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/filter-API.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/filter_template.c -%%PORTDOCS%%%%DOCSDIR%%/tech/html/index.html -%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_basic.css -%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_frame_buffer.html -%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_input_rotation.html -%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_libraries.html -%%PORTDOCS%%%%DOCSDIR%%/tech/html/tc_logo.png -%%PORTDOCS%%%%DOCSDIR%%/tech/ibp_support.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/import-API.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/libraries.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/module-system-API.txt -%%PORTDOCS%%%%DOCSDIR%%/template.cfg.txt |