index | | raw e-mail
-- -- Upstream, applying patch <libavcodec-videotoolboxenc-fix-memleak.patch> -- Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 8a969e1280aa7aef31de6bd3db5ce46dc123fde0 Mon Sep 17 00:00:00 2001 |From: songyutong <songyutong@kuaishou.com> |Date: Tue, 9 Nov 2021 18:51:58 +0800 |Subject: [PATCH] avcodec/videotoolboxenc: fix pixel buffer memory leak | |In function vtenc_populate_extradata(), there is a manually created |pixel buffer that has not been released. So we should use CVPixelBufferRelease |to release this pixel buffer at the end, otherwise will cause a memory leak. | |Signed-off-by: Rick Kern <kernrj@gmail.com> |--- | libavcodec/videotoolboxenc.c | 1 + | 1 file changed, 1 insertion(+) | |diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c |index bac36fda90e4..ebaa3ebdc8ab 100644 |--- a/libavcodec/videotoolboxenc.c |+++ b/libavcodec/videotoolboxenc.c -------------------------- Patching file libavcodec/videotoolboxenc.c using Plan A... Hunk #1 succeeded at 2548 (offset -6 lines). done -- -- Upstream, applying patch <libavcodec-videotoolboxenc-fix-non-bframe-encoding.patch> -- Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From b786bc7433dfe082441a57c1ba9ae9ea47904b78 Mon Sep 17 00:00:00 2001 |From: NoHalfBits <ffmpeg-devel@fluthaus.com> |Date: Sun, 26 Sep 2021 14:47:52 +0200 |Subject: [PATCH] avcodec/videotoolboxenc: Fixes non-B-Frame encoding | |Sets vtctx->has_b_frames to 0 if the VideoToolbox compression |session will not emit B-frames (and, in consequence, no valid |DTSs). Required for the handling of invalid DTSs in |'vtenc_cm_to_avpacket' (line 2018ff) to work correctly and not |abort encoding with "DTS is invalid." when no B-frames are |generated. | |Signed-off-by: NoHalfBits <ffmpeg-devel@fluthaus.com> |Signed-off-by: Rick Kern <kernrj@gmail.com> |--- | libavcodec/videotoolboxenc.c | 5 ++++- | 1 file changed, 4 insertions(+), 1 deletion(-) | |diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c |index 8dfd6e3d0c21..93c3898fb503 100644 |--- a/libavcodec/videotoolboxenc.c |+++ b/libavcodec/videotoolboxenc.c -------------------------- Patching file libavcodec/videotoolboxenc.c using Plan A... Hunk #1 succeeded at 1512 (offset -4 lines). done -- -- Upstream, applying patch <libswscale_fix_setcolorspacedetails_return_code.patch> -- Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 5f3a160b422e87e17d8fcd3aea51d478d0f05ba5 Mon Sep 17 00:00:00 2001 |From: Michael Niedermayer <michael@niedermayer.cc> |Date: Fri, 22 Oct 2021 23:24:11 +0200 |Subject: [PATCH] swscale/utils: Improve return codes of | sws_setColorspaceDetails() | |Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> |--- | libswscale/utils.c | 5 ++++- | 1 file changed, 4 insertions(+), 1 deletion(-) | |diff --git a/libswscale/utils.c b/libswscale/utils.c |index 3752c3ec38c0..c726922527b7 100644 |--- a/libswscale/utils.c |+++ b/libswscale/utils.c -------------------------- Patching file libswscale/utils.c using Plan A... Hunk #1 succeeded at 986 (offset -9 lines). done -- Patching Linux common.mak Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- ffbuild/common.mak.orig 2021-10-24 22:47:11.000000000 +0200 |+++ ffbuild/common.mak 2021-11-14 00:21:19.834422346 +0100 -------------------------- Patching file ffbuild/common.mak using Plan A... Hunk #1 succeeded at 125. done -- Checking for Bourne shell -- ************************* -- Found Bourne shell -- Configuring FFmpeg CMake Error at /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild_helpers.cmake:291 (MESSAGE): configure returned <1> Call Stack (most recent call first): /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild_native.cmake:61 (ADM_FF_BUILD_UNIX_STYLE) /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild.cmake:16 (include) CMakeLists.txt:95 (include) CMake Error at /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild_helpers.cmake:292 (MESSAGE): configure output is <ERROR: nvenc requested but not found If you think configure made a mistake, make sure you are using the latest version from Git. If the latest version fails, report the problem to the ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.libera.chat. Include the log file "ffbuild/config.log" produced by configure as this will help solve the problem. > Call Stack (most recent call first): /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild_native.cmake:61 (ADM_FF_BUILD_UNIX_STYLE) /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild.cmake:16 (include) CMakeLists.txt:95 (include) CMake Error at /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild_helpers.cmake:293 (MESSAGE): An error occured Call Stack (most recent call first): /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild_native.cmake:61 (ADM_FF_BUILD_UNIX_STYLE) /wrkdirs/usr/ports/multimedia/avidemux/work/avidemux_2.8.1/cmake/admFFmpegBuild.cmake:16 (include) CMakeLists.txt:95 (include) -- Configuring incomplete, errors occurred! *** Error code 1 Stop. make: stopped making "configure" in /usr/ports/multimedia/avidemuxhome | help