From ab71ce8d1923889e9ce10a270cd8db66e750681e Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 14 Jan 2022 18:45:42 +0000 Subject: [PATCH] multimedia/ffmpeg: update to 5.0.1 * --enable-avresample is gone per https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/420cedd49745 * SHADERC replaces GLSLANG per https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/da72aca7b025 * VULKAN is enabled per https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fa2e460f635 * LIBPLACEBO is enabled to have even more Vulkan goodies Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n5.0.1:/Changelog PR: 261302 Reported by: Repology Exp-run by: antoine --- multimedia/ffmpeg/Makefile | 25 +++++++---- multimedia/ffmpeg/distinfo | 6 +-- multimedia/ffmpeg/files/patch-dav1d | 39 ---------------- multimedia/ffmpeg/files/patch-svtav1 | 66 ++++++++++------------------ multimedia/ffmpeg/files/patch-vmaf | 27 ++++++------ multimedia/ffmpeg/pkg-plist | 41 ++++++++--------- 6 files changed, 74 insertions(+), 130 deletions(-) delete mode 100644 multimedia/ffmpeg/files/patch-dav1d diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5751e872088c..cbcea915991a 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,7 @@ # Created by: Martin Matuska PORTNAME= ffmpeg -PORTVERSION= 4.4.1 -PORTREVISION= 13 +PORTVERSION= 5.0.1 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ @@ -37,18 +36,18 @@ PORTSCOUT= limit:^4\. OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ASM ASS BS2B CACA CDIO \ CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \ FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM ICONV ILBC \ - JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBRSVG2 \ + JACK KLVANC KVAZAAR LADSPA LAME LENSFUN LIBBLURAY LIBPLACEBO LIBRSVG2 \ LIBXML2 LTO LV2 MFX MODPLUG MYSOFA OPENAL OPENCL OPENGL \ OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \ - PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SMB SNAPPY \ + PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SHADERC SMB SNAPPY \ SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \ TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \ VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \ XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \ - GNUTLS ICONV LAME LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \ - THEORA V4L VAAPI VDPAU VMAF VORBIS VPX X264 X265 XCB XVID + GNUTLS ICONV LAME LIBPLACEBO LIBXML2 OPTIMIZED_CFLAGS OPUS RTCPU \ + THEORA V4L VAAPI VDPAU VMAF VORBIS VPX VULKAN X264 X265 XCB XVID OPTIONS_DEFAULT_amd64= SVTAV1 # i386 is too register-starved for LTO (PR257124) @@ -123,10 +122,12 @@ RIST_DESC= Reliable Internet Stream Transport protocol via librist RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband RTCPU_DESC= Detect CPU capabilities at runtime RTMP_DESC= RTMP(T)E protocol support +SHADERC_DESC= GLSL->SPIRV compilation via libshaderc SRT_DESC= Haivision SRT protocol via libsrt SVTAV1_DESC= AV1 encoding via SVT-AV1 SVTHEVC_DESC= HEVC encoding via SVT-HEVC SVTVP9_DESC= VP9 encoding via SVT-VP9 +LIBPLACEBO_DESC=GPU filters from libplacebo LIBRTMP_DESC= ${RTMP_DESC} via librtmp TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr TESSERACT_DESC= Optical Character Recognition via Tesseract @@ -306,6 +307,10 @@ LENSFUN_CONFIGURE_ENABLE= liblensfun LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray +# libplacebo +LIBPLACEBO_LIB_DEPENDS= libplacebo.so:graphics/libplacebo +LIBPLACEBO_CONFIGURE_ENABLE= libplacebo + # librsvg LIBRSVG2_USES= gnome LIBRSVG2_USE= GNOME=cairo,librsvg2 @@ -425,6 +430,11 @@ SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_CONFIGURE_ENABLE= sdl2 +# shaderc +SHADERC_LIB_DEPENDS= libshaderc_shared.so:graphics/shaderc +SHADERC_CONFIGURE_ENABLE= libshaderc +SHADERC_PREVENTS= GLSLANG + # smbclient SMB_USES= samba:lib SMB_CONFIGURE_ENABLE= libsmbclient @@ -536,7 +546,7 @@ VPX_CONFIGURE_ENABLE= libvpx VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CONFIGURE_ENABLE= vulkan -VULKAN_IMPLIES= GLSLANG +VULKAN_IMPLIES= ${"${PORT_OPTIONS:MGLSLANG}":?GLSLANG:SHADERC} # webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp @@ -609,7 +619,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --enable-shared \ --enable-pic \ --enable-gpl \ - --enable-avresample \ --cc="${CC}" \ --cxx="${CXX}" diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 5653a5667639..d5a562139b8c 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1635171801 -SHA256 (ffmpeg-4.4.1.tar.xz) = eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02 -SIZE (ffmpeg-4.4.1.tar.xz) = 9557516 +TIMESTAMP = 1649083222 +SHA256 (ffmpeg-5.0.1.tar.xz) = ef2efae259ce80a240de48ec85ecb062cecca26e4352ffb3fda562c21a93007b +SIZE (ffmpeg-5.0.1.tar.xz) = 9812524 SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 376ea23e9d876390fbca936c80cb437bb9daa6232ff65df0ea91673e18b739ff SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24259 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = d16589efc4be2602a9f436e9938cfee0cc7b5ccd7a4a6b41c0c9a59ae0859fda diff --git a/multimedia/ffmpeg/files/patch-dav1d b/multimedia/ffmpeg/files/patch-dav1d deleted file mode 100644 index 4af5b8b518e5..000000000000 --- a/multimedia/ffmpeg/files/patch-dav1d +++ /dev/null @@ -1,39 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/61ed1182eeb2 -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/cc33e73618a9 -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a4e1dd694014 - ---- libavcodec/libdav1d.c.orig 2021-10-24 20:47:11 UTC -+++ libavcodec/libdav1d.c -@@ -127,7 +127,11 @@ static av_cold int libdav1d_init(AVCodecContext *c) - { - Libdav1dContext *dav1d = c->priv_data; - Dav1dSettings s; -+#if FF_DAV1D_VERSION_AT_LEAST(6,0) -+ int threads = c->thread_count; -+#else - int threads = (c->thread_count ? c->thread_count : av_cpu_count()) * 3 / 2; -+#endif - int res; - - av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version()); -@@ -153,7 +157,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) - s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); - else - s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); -- s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads; -+ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : 0; - av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", - s.n_threads, s.max_frame_delay); - #else -@@ -244,8 +248,10 @@ static int libdav1d_receive_frame(AVCodecContext *c, A - if (res < 0) { - if (res == AVERROR(EINVAL)) - res = AVERROR_INVALIDDATA; -- if (res != AVERROR(EAGAIN)) -+ if (res != AVERROR(EAGAIN)) { -+ dav1d_data_unref(data); - return res; -+ } - } - - res = dav1d_get_picture(dav1d->c, p); diff --git a/multimedia/ffmpeg/files/patch-svtav1 b/multimedia/ffmpeg/files/patch-svtav1 index 5cb3b47c42eb..70db5df1c467 100644 --- a/multimedia/ffmpeg/files/patch-svtav1 +++ b/multimedia/ffmpeg/files/patch-svtav1 @@ -1,7 +1,3 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/04b89e8ae33b -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/64e2fb3f9d89 -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/0463f5d6d56d -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c5f314309067 https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c33b4048859a https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a2b090da7932 https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/1dddb930aaf0 @@ -10,9 +6,9 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/50bc87263576 https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/d794b36a7788 https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be ---- configure.orig 2021-10-24 20:47:11 UTC +--- configure.orig 2022-01-14 18:45:39 UTC +++ configure -@@ -6430,7 +6430,7 @@ enabled libsrt && require_pkg_config libsrt +@@ -6604,7 +6604,7 @@ enabled libsrt && require_pkg_config libsrt enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket @@ -21,11 +17,11 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg ---- doc/encoders.texi.orig 2021-10-24 20:47:07 UTC +--- doc/encoders.texi.orig 2022-01-14 18:45:39 UTC +++ doc/encoders.texi -@@ -1754,28 +1754,15 @@ Set the operating point tier. - @item tier - Set the operating point tier. +@@ -1775,28 +1775,15 @@ This is the default. + @item high + @end table -@item rc -Set the rate control mode to use. @@ -55,7 +51,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be @item qp Set the quantizer used in cqp rate control mode (0-63). -@@ -1786,14 +1773,18 @@ Set number of frames to look ahead (0-120). +@@ -1807,14 +1794,18 @@ Set number of frames to look ahead (0-120). Set number of frames to look ahead (0-120). @item preset @@ -76,7 +72,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be @end table ---- libavcodec/libsvtav1.c.orig 2021-10-24 20:47:07 UTC +--- libavcodec/libsvtav1.c.orig 2022-01-14 18:45:40 UTC +++ libavcodec/libsvtav1.c @@ -60,17 +60,20 @@ typedef struct SvtContext { EOS_STATUS eos_flag; @@ -199,20 +195,20 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be if (avctx->gop_size > 0) param->intra_period_length = avctx->gop_size - 1; -@@ -205,19 +263,15 @@ static int config_enc_params(EbSvtAv1EncConfiguration +@@ -205,8 +263,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame; } +- param->enable_tpl_la = !!param->rate_control_mode; - if (param->rate_control_mode) { + avctx->bit_rate = param->target_bit_rate; + if (avctx->bit_rate) { param->max_qp_allowed = avctx->qmax; param->min_qp_allowed = avctx->qmin; } - -- param->intra_refresh_type = 2; /* Real keyframes only */ -+ /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ -+ param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1; +@@ -214,12 +272,6 @@ static int config_enc_params(EbSvtAv1EncConfiguration + /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ + param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1; - if (svt_enc->la_depth >= 0) - param->look_ahead_distance = svt_enc->la_depth; @@ -223,7 +219,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be return 0; } -@@ -472,21 +526,22 @@ static const AVOption options[] = { +@@ -474,21 +526,22 @@ static const AVOption options[] = { #define OFFSET(x) offsetof(SvtContext, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -255,12 +251,12 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be FF_AV1_PROFILE_OPTS -@@ -518,21 +573,20 @@ static const AVOption options[] = { +@@ -520,21 +573,20 @@ static const AVOption options[] = { { LEVEL("7.3", 73) }, #undef LEVEL - { "rc", "Bit rate control mode", OFFSET(rc_mode), -- AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, VE , "rc"}, +- AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE , "rc"}, - { "cqp", "Constant quantizer", 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "rc" }, - { "vbr", "Variable Bit Rate, use a target bitrate for the entire stream", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "rc" }, - { "cvbr", "Constrained Variable Bit Rate, use a target bitrate for each GOP", 0, AV_OPT_TYPE_CONST,{ .i64 = 2 }, INT_MIN, INT_MAX, VE, "rc" }, @@ -288,41 +284,25 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/51c0b9e829be {NULL}, }; -@@ -544,9 +598,10 @@ static const AVCodecDefault eb_enc_defaults[] = { +@@ -546,10 +598,10 @@ static const AVCodecDefault eb_enc_defaults[] = { }; static const AVCodecDefault eb_enc_defaults[] = { - { "b", "7M" }, + { "b", "0" }, -+ { "flags", "+cgop" }, + { "flags", "+cgop" }, { "g", "-1" }, - { "qmin", "0" }, + { "qmin", "1" }, { "qmax", "63" }, { NULL }, }; -@@ -561,12 +616,11 @@ AVCodec ff_libsvtav1_encoder = { - .receive_packet = eb_receive_packet, - .close = eb_enc_close, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, -- .caps_internal = FF_CODEC_CAP_AUTO_THREADS, -+ .caps_internal = FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, - AV_PIX_FMT_YUV420P10, - AV_PIX_FMT_NONE }, - .priv_class = &class, - .defaults = eb_enc_defaults, -- .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .wrapper_name = "libsvtav1", - }; ---- libavcodec/version.h.orig 2021-10-24 20:47:07 UTC +--- libavcodec/version.h.orig 2022-01-14 18:45:40 UTC +++ libavcodec/version.h -@@ -168,5 +168,8 @@ - #ifndef FF_API_INIT_PACKET - #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) - #endif -+#ifndef FF_API_SVTAV1_OPTS +@@ -63,5 +63,6 @@ + #define FF_API_MPEGVIDEO_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) + #define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) + #define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_SVTAV1_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) -+#endif #endif /* AVCODEC_VERSION_H */ diff --git a/multimedia/ffmpeg/files/patch-vmaf b/multimedia/ffmpeg/files/patch-vmaf index abe772274d3c..28b07ef2e9fd 100644 --- a/multimedia/ffmpeg/files/patch-vmaf +++ b/multimedia/ffmpeg/files/patch-vmaf @@ -1,9 +1,9 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d ---- configure.orig 2021-10-24 20:47:11 UTC +--- configure.orig 2022-01-14 18:45:39 UTC +++ configure -@@ -3663,7 +3663,7 @@ vidstabtransform_filter_deps="libvidstab" - vaguedenoiser_filter_deps="gpl" +@@ -3747,7 +3747,7 @@ vidstabtransform_filter_deps="libvidstab" + vflip_vulkan_filter_deps="vulkan spirv_compiler" vidstabdetect_filter_deps="libvidstab" vidstabtransform_filter_deps="libvidstab" -libvmaf_filter_deps="libvmaf pthreads" @@ -11,7 +11,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d zmq_filter_deps="libzmq" zoompan_filter_deps="swscale" zscale_filter_deps="libzimg const_nan" -@@ -6441,7 +6441,7 @@ enabled libvidstab && require_pkg_config libvid +@@ -6615,7 +6615,7 @@ enabled libvidstab && require_pkg_config libvid enabled libuavs3d && require_pkg_config libuavs3d "uavs3d >= 1.1.41" uavs3d.h uavs3d_decode enabled libv4l2 && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit @@ -20,9 +20,9 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init && require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init ---- doc/filters.texi.orig 2021-10-24 20:47:07 UTC +--- doc/filters.texi.orig 2022-01-14 18:45:39 UTC +++ doc/filters.texi -@@ -13867,66 +13867,58 @@ ffmpeg -i input.mov -vf lensfun=make=Canon:model="Cano +@@ -14666,68 +14666,60 @@ ffmpeg -i input.mov -vf lensfun=make=Canon:model="Cano @section libvmaf @@ -31,6 +31,9 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d +Calulate the VMAF (Video Multi-Method Assessment Fusion) score for a +reference/distorted pair of input videos. +-The first input is the encoded video, and the second input is the reference video. ++The first input is the distorted video, and the second input is the reference video. + The obtained VMAF score is printed through the logging system. It requires Netflix's vmaf library (libvmaf) as a pre-requisite. @@ -115,7 +118,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d @end table This filter also supports the @ref{framesync} options. -@@ -13934,23 +13926,31 @@ This filter also supports the @ref{framesync} options. +@@ -14735,23 +14727,31 @@ This filter also supports the @ref{framesync} options. @subsection Examples @itemize @item @@ -153,7 +156,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d @end example @end itemize ---- libavfilter/vf_libvmaf.c.orig 2021-10-24 20:47:07 UTC +--- libavfilter/vf_libvmaf.c.orig 2022-01-14 18:45:40 UTC +++ libavfilter/vf_libvmaf.c @@ -24,8 +24,8 @@ * Calculate the VMAF between two input videos. @@ -805,7 +808,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d s->fs.on_event = do_vmaf; return 0; } -@@ -265,31 +554,36 @@ static int config_input_ref(AVFilterLink *inlink) +@@ -256,27 +545,32 @@ static int config_input_ref(AVFilterLink *inlink) static int config_input_ref(AVFilterLink *inlink) { @@ -824,10 +827,6 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d + av_log(ctx, AV_LOG_ERROR, "input width must match.\n"); + err |= AVERROR(EINVAL); } - if (ctx->inputs[0]->format != ctx->inputs[1]->format) { - av_log(ctx, AV_LOG_ERROR, "Inputs must be of same pixel format.\n"); - return AVERROR(EINVAL); - } - s->desc = av_pix_fmt_desc_get(inlink->format); - s->width = ctx->inputs[0]->w; @@ -856,7 +855,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/3d29724c008d return 0; } -@@ -320,28 +614,80 @@ static int activate(AVFilterContext *ctx) +@@ -307,28 +601,80 @@ static int activate(AVFilterContext *ctx) return ff_framesync_activate(&s->fs); } diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist index 6f5f8c0b8db6..a77b28a050e2 100644 --- a/multimedia/ffmpeg/pkg-plist +++ b/multimedia/ffmpeg/pkg-plist @@ -12,6 +12,7 @@ include/libavcodec/codec_desc.h include/libavcodec/codec_id.h include/libavcodec/codec_par.h include/libavcodec/d3d11va.h +include/libavcodec/defs.h include/libavcodec/dirac.h include/libavcodec/dv_profile.h include/libavcodec/dxva2.h @@ -19,7 +20,6 @@ include/libavcodec/jni.h include/libavcodec/mediacodec.h include/libavcodec/packet.h include/libavcodec/qsv.h -include/libavcodec/vaapi.h include/libavcodec/vdpau.h include/libavcodec/version.h include/libavcodec/videotoolbox.h @@ -34,8 +34,6 @@ include/libavfilter/version.h include/libavformat/avformat.h include/libavformat/avio.h include/libavformat/version.h -include/libavresample/avresample.h -include/libavresample/version.h include/libavutil/adler32.h include/libavutil/aes.h include/libavutil/aes_ctr.h @@ -57,6 +55,7 @@ include/libavutil/common.h include/libavutil/cpu.h include/libavutil/crc.h include/libavutil/des.h +include/libavutil/detection_bbox.h include/libavutil/dict.h include/libavutil/display.h include/libavutil/dovi_meta.h @@ -130,37 +129,33 @@ include/libswresample/version.h include/libswscale/swscale.h include/libswscale/version.h lib/libavcodec.so -lib/libavcodec.so.58 -lib/libavcodec.so.58.134.100 +lib/libavcodec.so.59 +lib/libavcodec.so.59.18.100 lib/libavdevice.so -lib/libavdevice.so.58 -lib/libavdevice.so.58.13.100 +lib/libavdevice.so.59 +lib/libavdevice.so.59.4.100 lib/libavfilter.so -lib/libavfilter.so.7 -lib/libavfilter.so.7.110.100 +lib/libavfilter.so.8 +lib/libavfilter.so.8.24.100 lib/libavformat.so -lib/libavformat.so.58 -lib/libavformat.so.58.76.100 -lib/libavresample.so -lib/libavresample.so.4 -lib/libavresample.so.4.0.0 +lib/libavformat.so.59 +lib/libavformat.so.59.16.100 lib/libavutil.so -lib/libavutil.so.56 -lib/libavutil.so.56.70.100 +lib/libavutil.so.57 +lib/libavutil.so.57.17.100 lib/libpostproc.so -lib/libpostproc.so.55 -lib/libpostproc.so.55.9.100 +lib/libpostproc.so.56 +lib/libpostproc.so.56.3.100 lib/libswresample.so -lib/libswresample.so.3 -lib/libswresample.so.3.9.100 +lib/libswresample.so.4 +lib/libswresample.so.4.3.100 lib/libswscale.so -lib/libswscale.so.5 -lib/libswscale.so.5.9.100 +lib/libswscale.so.6 +lib/libswscale.so.6.4.100 libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc libdata/pkgconfig/libavformat.pc -libdata/pkgconfig/libavresample.pc libdata/pkgconfig/libavutil.pc libdata/pkgconfig/libpostproc.pc libdata/pkgconfig/libswresample.pc