git: 13c1171a710b - main - multimedia/ffmpeg: update to 4.4.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 18 Apr 2022 17:49:17 UTC
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=13c1171a710babe6a6b29d157d78afd0e5728f64 commit 13c1171a710babe6a6b29d157d78afd0e5728f64 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-04-14 20:13:48 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-04-18 17:48:09 +0000 multimedia/ffmpeg: update to 4.4.2 Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.4.2:/Changelog Reported by: OpenBSD --- multimedia/ffmpeg/Makefile | 3 +-- multimedia/ffmpeg/distinfo | 6 +++--- multimedia/ffmpeg/files/patch-dav1d | 39 ------------------------------------- 3 files changed, 4 insertions(+), 44 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5751e872088c..765ec58b8f61 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,7 @@ # Created by: Martin Matuska <mm@FreeBSD.org> PORTNAME= ffmpeg -PORTVERSION= 4.4.1 -PORTREVISION= 13 +PORTVERSION= 4.4.2 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 5653a5667639..9867c19e4891 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 = 1649967228 +SHA256 (ffmpeg-4.4.2.tar.xz) = af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 +SIZE (ffmpeg-4.4.2.tar.xz) = 9562968 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);