jengelh/ffmpeg-4
SHA256
1
0
Fork 4
forked from pool/ffmpeg-4
Code Pull Requests Activity

Fix *again* order of changelog messages.

Browse Source
This commit is contained in:
Manfred Hollstein
2025-03-12 17:40:50 +01:00
parent 586c2cf68f
commit 6723231bb5
4 changed files with 118 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch Normal file
View File

@@ -0,0 +1,33 @@
From d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95 Mon Sep 17 00:00:00 2001
From: Gyan Doshi <ffmpeg@gyani.pro>
Date: Sat, 22 Feb 2025 10:38:53 +0530
Subject: [PATCH] avcodec/libsvtav1: unbreak build with latest svtav1
SVT-AV1 made a change in their public API in 988e930c but without a
version bump or any other accessible marker, thus breaking ffmpeg build
with current versions of SVT-AV1.
They have finally bumped versions a month later, so check added.
---
libavcodec/libsvtav1.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 79b28eb4df..43fe531fde 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -435,7 +435,11 @@ static av_cold int eb_enc_init(AVCodecContext *avctx)
svt_enc->eos_flag = EOS_NOT_REACHED;
+#if SVT_AV1_CHECK_VERSION(3, 0, 0)
+ svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, &svt_enc->enc_params);
+#else
svt_ret = svt_av1_enc_init_handle(&svt_enc->svt_handle, svt_enc, &svt_enc->enc_params);
+#endif
if (svt_ret != EB_ErrorNone) {
return svt_print_error(avctx, svt_ret, "Error initializing encoder handle");
}
--
2.48.1

31
ffmpeg-4-CVE-2024-35368.patch Normal file
View File

@@ -0,0 +1,31 @@
From 4513300989502090c4fd6560544dce399a8cd53c Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Sun, 24 Sep 2023 13:15:48 +0200
Subject: [PATCH] avcodec/rkmppdec: Fix double-free on error
After having created the AVBuffer that is put into frame->buf[0],
ownership of several objects (namely an AVDRMFrameDescriptor,
an MppFrame and some AVBufferRefs framecontextref and decoder_ref)
has passed to the AVBuffer and therefore to the frame.
Yet it has nevertheless been freed manually on error
afterwards, which would lead to a double-free as soon
as the AVFrame is unreferenced.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
libavcodec/rkmppdec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/libavcodec/rkmppdec.c
+++ b/libavcodec/rkmppdec.c
@@ -460,8 +460,8 @@
frame->hw_frames_ctx = av_buffer_ref(decoder->frames_ref);
if (!frame->hw_frames_ctx) {
- ret = AVERROR(ENOMEM);
- goto fail;
+ av_frame_unref(frame);
+ return AVERROR(ENOMEM);
}
return 0;

59
ffmpeg-4.changes
View File

@@ -1,7 +1,13 @@
-------------------------------------------------------------------
Wed Mar 5 09:46:09 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
to build with SVT-AV1 3.0.0.
-------------------------------------------------------------------
Fri Feb 19 05:17:22 UTC 2025 - Cliff Zhao <qzhao@suse.com>
- Add ffmpeg-7-CVE-2025-22921.patch:
- Add ffmpeg-4-CVE-2025-22921.patch:
Backporting 7f9c7f98 from upstream, clear array length when
freeing it.
(CVE-2025-22921, bsc#1237382)
@@ -9,7 +15,7 @@ Fri Feb 19 05:17:22 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-------------------------------------------------------------------
Fri Feb 19 04:27:06 UTC 2025 - Cliff Zhao <qzhao@suse.com>
- Add ffmpeg-7-CVE-2025-25473.patch:
- Add ffmpeg-4-CVE-2025-25473.patch:
Backporting c08d3004 from upstream, clear FFFormatContext packet.
When packet_buffer is used in mux.c, and if a muxing process fails
at a point where packets remained in said queue.
@@ -18,7 +24,7 @@ Fri Feb 19 04:27:06 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-------------------------------------------------------------------
Fri Feb 19 03:18:02 UTC 2025 - Cliff Zhao <qzhao@suse.com>
- Add ffmpeg-7-CVE-2025-0518.patch:
- Add ffmpeg-4-CVE-2025-0518.patch:
Backporting b5b6391d from upstream, fixes memory data leak when
use sscanf().
(CVE-2025-0518, bsc#1236007)
@@ -26,7 +32,7 @@ Fri Feb 19 03:18:02 UTC 2025 - Cliff Zhao <qzhao@suse.com>
-------------------------------------------------------------------
Fri Feb 19 02:58:01 UTC 2025 - Cliff Zhao <qzhao@suse.com>
- Add ffmpeg-7-CVE-2025-22919.patch:
- Add ffmpeg-4-CVE-2025-22919.patch:
Backporting 1446e37d from upstream, check for valid sample rate
As the sample rate <= 0 is invalid.
(CVE-2025-22919, bsc#1237371)
@@ -39,6 +45,15 @@ Fri Feb 19 01:48:22 UTC 2025 - Cliff Zhao <qzhao@suse.com>
to avoid null pointer dereference if allocation fails.
(CVE-2024-12361, bsc#1237358)
-------------------------------------------------------------------
Fri Feb 19 01:11:17 UTC 2025 - Cliff Zhao <qzhao@suse.com>
- Add ffmpeg-4-CVE-2024-35368.patch:
Backporting 45133009 from upstream, After having created the
AVBuffer that is put into frame->buf[0], ownership of several
objects Fix double-free on the AVFrame is unreferenced.
(CVE-2024-35368, bsc#1234028)
-------------------------------------------------------------------
Mon Jan 6 11:53:32 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
@@ -53,6 +68,7 @@ Mon Jan 6 11:53:32 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
0001-avfilter-vf_minterpolate-Check-pts-before-division.patch
ffmpeg-CVE-2023-51793.patch
0001-avfilter-af_stereowiden-Check-length.patch
ffmpeg-fix-new-binutils.patch
ffmpeg-CVE-2023-50010.patch
ffmpeg-4-CVE-2024-32230.patch
ffmpeg-4-CVE-2024-7055.patch (all merged)
@@ -147,6 +163,13 @@ Wed Dec 6 08:50:00 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Copy codec list from ffmpeg-6
-------------------------------------------------------------------
Fri Nov 3 08:17:13 UTC 2023 - Marcus Meissner <meissner@suse.com>
- Add ffmpeg-fix-new-binutils.patch:
Backporting 01fc3034 from upstream, Fix build with new binutils
(bsc#1215309)
-------------------------------------------------------------------
Mon Oct 30 11:16:43 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
@@ -163,6 +186,14 @@ Tue Jun 27 07:42:23 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch
-------------------------------------------------------------------
Thu Apr 27 09:27:53 UTC 2023 - Alynx Zhou <alynx.zhou@suse.com>
- Add ffmpeg-4-CVE-2022-48434.patch:
Backport d4b7b3c0 from upstream, Fix use after free in
libavcodec/pthread_frame.c.
(CVE-2022-48434, bsc#1209934)
-------------------------------------------------------------------
Wed Apr 19 21:00:41 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
@@ -170,7 +201,7 @@ Wed Apr 19 21:00:41 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
* avcodec/012v: Order operations for odd size handling
* avcodec/alsdec: The minimal block is at least 7 bits
* avcodec/bink:
- Avoid undefined out of array end pointers in
- Avoid undefined out of array end pointers in
binkb_decode_plane()
- Fix off by 1 error in ref end
* avcodec/eac3dec: avoid float noise in fixed mode addition to
@@ -234,7 +265,9 @@ Wed Apr 19 21:00:41 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
* ffmpeg-CVE-2022-3964.patch
* ffmpeg-CVE-2022-3109.patch
* ffmpeg-CVE-2022-3341.patch
* ffmpeg-4-CVE-2022-48434.patch
- Use ldconfig_scriptlets macro.
(CVE-2022-48434, bsc#1209934)
-------------------------------------------------------------------
Thu Mar 16 17:54:51 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
@@ -329,6 +362,8 @@ Thu Oct 28 15:58:30 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
* ffmpeg-CVE-2021-38114.patch
* ffmpeg-CVE-2021-38171.patch
* ffmpeg-CVE-2020-22037.patch
- fix avfilter/vf_yadif: Fix handing of tiny images.
(CVE-2020-22021, bsc#1186586)
-------------------------------------------------------------------
Sun Sep 26 02:44:57 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
@@ -354,7 +389,7 @@ Tue Aug 10 09:38:39 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
-------------------------------------------------------------------
Sat Jul 10 10:11:32 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains
- Remove second hunk of ffmpeg-CVE-2020-22046.patch, that contains
a goto to a none existing label. In order to distinguish this
patch from the original, I renamed it to
ffmpeg-4.4-CVE-2020-22046.patch
@@ -380,7 +415,7 @@ Fri Jun 4 12:29:16 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
-------------------------------------------------------------------
Thu May 20 23:16:09 UTC 2021 - Daniel Molkentin <daniel.molkentin@suse.com>
- Enable vulkan on on Leap 15
- Enable vulkan on on Leap 15
-------------------------------------------------------------------
Fri Apr 16 10:20:15 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
@@ -399,8 +434,8 @@ Fri Apr 9 18:52:46 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
Sun Mar 14 21:08:02 UTC 2021 - Dirk Müller <dmueller@suse.com>
- update to 4.3.2:
* lots of oss-fuzz reported overflow fixes, see included ChangeLog
- drop
* lots of oss-fuzz reported overflow fixes, see included ChangeLog
- drop
ffmpeg.git-ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a.patch
0001-lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch
0001-avformat-vividas-improve-extradata-packing-checks-in.patch: upstream
@@ -416,7 +451,7 @@ Sun Jan 24 11:22:02 UTC 2021 - Dirk Müller <dmueller@suse.com>
- remove dependency on OpenJPEG, this is obsolete since ffmpeg 4.0,
we already build against OpenJPEG 2.1.
see changes:
see changes:
- Dropped support for OpenJPEG versions 2.0 and below. Using OpenJPEG now
requires 2.1 (or later) and pkg-config.
@@ -448,7 +483,7 @@ Mon Jul 27 13:39:27 UTC 2020 - Hans-Peter Jansen <hpj@urpla.net>
-------------------------------------------------------------------
Thu Jul 16 10:49:02 UTC 2020 - Alexander Reimelt <alexander.reimelt@protonmail.ch>
- Add librav1e support
- Add librav1e support
-------------------------------------------------------------------
Sun Jul 12 16:08:10 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
@@ -515,7 +550,7 @@ Fri Mar 31 00:41:22 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
- Add Samba support for Factory (as this needs a fix in Samba itself)
Add --enable-libsmbclient to configure, add BR on pkgconfig(smbclient)
- License is now GPLv3+ by default (--enable-version3)
-------------------------------------------------------------------
Mon Mar 30 07:14:39 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

12
ffmpeg-4.spec
View File

@@ -134,14 +134,16 @@ Patch10: ffmpeg-chromium.patch
Patch11: ffmpeg-libglslang-detection.patch
Patch14: ffmpeg-glslang-cxx17.patch
Patch15: 0001-avutil-hwcontext-Don-t-assume-frames_uninit-is-reent.patch
Patch16: 0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
Patch17: ffmpeg-CVE-2023-49502.patch
Patch22: ffmpeg-c99.patch
Patch23: 0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch
Patch24: ffmpeg-4-CVE-2024-12361.patch
Patch25: ffmpeg-4-CVE-2025-22919.patch
Patch26: ffmpeg-4-CVE-2025-0518.patch
Patch27: ffmpeg-4-CVE-2025-25473.patch
Patch28: ffmpeg-4-CVE-2025-22921.patch
Patch24: ffmpeg-4-CVE-2024-35368.patch
Patch25: ffmpeg-4-CVE-2024-12361.patch
Patch26: ffmpeg-4-CVE-2025-22919.patch
Patch27: ffmpeg-4-CVE-2025-0518.patch
Patch28: ffmpeg-4-CVE-2025-25473.patch
Patch29: ffmpeg-4-CVE-2025-22921.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel