0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch

@@ -1,33 +0,0 @@
-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
-

ffmpeg-7.1.1.tar.xz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQFMBAABCgA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmfE+J4YHGZmbXBlZy1k
-ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYNAwH/3i5n8X6+6Gw+1U+k6Lfwe4t
-d1AmG/XyJd3ZkqnSXmtpW/p/DoHaRQLTJMHq/5jWi0Dcpr8M8VD0pZxzEksfy0XY
-xHEqKXRG37/SyoiH39+BXWOSry4shIhzTVfmQi9QGZ0i69J+ZOpP1cImWz2c6QBM
-Q2FMPv1QMVNR2UWHDGgYAvvg2qfJfGgIdQQtvAQe1q3co6LuaZC0ndgoNmNyuPLV
-nNmsoetZucoNC4M7kcevyssrRMDi+yHk5X86LfV/cBY+BKP9X8u8pieXrnctSYAh
-qqBnsg4jSj3fB96QvsFsdbUWEECKm4/gWJngMQTMk2Tg0RpQAwfHvp21Lppo/xw=
-=xzGf
------END PGP SIGNATURE-----

ffmpeg-7.1.2.tar.xz.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQFMBAABCgA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmjHGF0YHGZmbXBlZy1k
+ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYY+0IAI4Haqz3h9AMEPwppJTY/R+A
+3FKY3HqPZXfCiF5V7q6R76ejk4ZheiEmNWw/FGq9mrvhEBDBmfYWHastaizo2ER6
+8ckOv+u/cA7YUYYdxvw7RQZqSGTrnpO9g3A/z84bjmCKW4DvSsM0Epg50E8oJsQo
+xojOwk5EVmEOnyNbroUHAOKXDux2C8QpxFkKP6HLHme1SlTQTfVZn2G38tN4KmaN
+T/p7HaR/nnLMnWC6IYWd0ss70AbRBNaIOdjPu7scA67HSS8Vb6WLOmcMjA9umrbI
+MftDxyx771uKc/pLMfEFFc6Pq1Ajy/qhrVesjTzXVyp9IUwP6wbjCDW7aKvkGKQ=
+=ew1G
+-----END PGP SIGNATURE-----

ffmpeg-7.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Sep 19 18:44:35 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 7.1.2:
+  * avcodec/librsvgdec: fix compilation with librsvg 2.50.3
+  * libavfilter/af_firequalizer: Add check for av_malloc_array()
+  * avcodec/libsvtav1: unbreak build with latest svtav1
+  * avformat/hls: Fix Youtube AAC
+  * Various bugfixes.
+- Drop patches fixed upstream:
+  * 0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
+  * ffmpeg-CVE-2025-7700.patch
+
 -------------------------------------------------------------------
 Wed Jul 23 13:28:49 UTC 2025 - Hans-Peter Jansen <hp@urpla.net>
 

ffmpeg-7.spec

@@ -97,7 +97,7 @@
 %define _major_expected 8
 
 Name:           ffmpeg-7
-Version:        7.1.1
+Version:        7.1.2
 Release:        0
 Summary:        Set of libraries for working with various multimedia formats
 License:        GPL-3.0-or-later
@@ -122,8 +122,6 @@ Patch10:        ffmpeg-chromium.patch
 Patch15:        11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
 Patch18:        ffmpeg-7-CVE-2025-25473.patch
 Patch19:        ffmpeg-7-CVE-2025-22921.patch
-Patch20:        0001-avcodec-libsvtav1-unbreak-build-with-latest-svtav1.patch
-Patch21:        ffmpeg-CVE-2025-7700.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  nasm

ffmpeg-CVE-2025-7700.patch

@@ -1,45 +0,0 @@
-From 35a6de137a39f274d5e01ed0e0e6c4f04d0aaf07 Mon Sep 17 00:00:00 2001
-From: Jiasheng Jiang <jiashengjiangcool@gmail.com>
-Date: Thu, 10 Jul 2025 16:26:39 +0000
-Subject: [PATCH] libavcodec/alsdec.c: Add check for av_malloc_array() and
- av_calloc()
-
-Add check for the return value of av_malloc_array() and av_calloc()
-to avoid potential NULL pointer dereference.
-
-Fixes: dcfd24b10c ("avcodec/alsdec: Implement floating point sample data decoding")
-Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavcodec/alsdec.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
-index 734eec8bf8..97b04a95f9 100644
---- a/libavcodec/alsdec.c
-+++ b/libavcodec/alsdec.c
-@@ -2119,8 +2119,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
-         ctx->nbits  = av_malloc_array(ctx->cur_frame_length, sizeof(*ctx->nbits));
-         ctx->mlz    = av_mallocz(sizeof(*ctx->mlz));
- 
--        if (!ctx->mlz || !ctx->acf || !ctx->shift_value || !ctx->last_shift_value
--            || !ctx->last_acf_mantissa || !ctx->raw_mantissa) {
-+        if (!ctx->larray || !ctx->nbits || !ctx->mlz || !ctx->acf || !ctx->shift_value
-+            || !ctx->last_shift_value || !ctx->last_acf_mantissa || !ctx->raw_mantissa) {
-             av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
-             return AVERROR(ENOMEM);
-         }
-@@ -2132,6 +2132,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
- 
-         for (c = 0; c < channels; ++c) {
-             ctx->raw_mantissa[c] = av_calloc(ctx->cur_frame_length, sizeof(**ctx->raw_mantissa));
-+            if (!ctx->raw_mantissa[c]) {
-+                av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
-+                return AVERROR(ENOMEM);
-+            }
-         }
-     }
- 
--- 
-2.25.1
-