[rpms/ffmpeg] epel9-next: Backport upstream patch to fix segfault when passing non-existent filter

[rpms/ffmpeg] epel9-next: Backport upstream patch to fix segfault when passing non-existent filter

[Dominik Mierzejewski]

          A new commit has been pushed.

          Repo   : rpms/ffmpeg
          Branch : epel9-next
          Commit : 853aa9d7cf3e80fa9f3ad9ce6a54ba3ba086894d
          Author : Dominik Mierzejewski <dominik@greysector.net>
          Date   : 2023-10-09T10:09:54+02:00
          Stats  : +39/-1 in 2 file(s)
          URL    : https://src.fedoraproject.org/rpms/ffmpeg/c/853aa9d7cf3e80fa9f3ad9ce6a54ba3ba086894d?branch=epel9-next

          Log:
          Backport upstream patch to fix segfault when passing non-existent filter

option (rfbz#6773)

---
diff --git a/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch b/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
new file mode 100644
index 0000000..85b43a4
--- /dev/null
+++ b/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
@@ -0,0 +1,30 @@
+From a0a0a804998da8d1a397479c9bafeb000e6be088 Mon Sep 17 00:00:00 2001
+From: Jun Zhao <barryjzhao@tencent.com>
+Date: Sat, 25 Feb 2023 21:54:00 +0800
+Subject: [PATCH] fftools/ffmpeg_filter: initialize the 'o' to silence the
+ warning
+
+silence the warning: variable 'o' is used uninitialized whenever
+'&&' condition is false
+
+Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
+---
+ fftools/ffmpeg_filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
+index 1f5bbf6c4d..3504a3cc0a 100644
+--- a/fftools/ffmpeg_filter.c
++++ b/fftools/ffmpeg_filter.c
+@@ -362,7 +362,7 @@ fail:
+ 
+ static int filter_opt_apply(AVFilterContext *f, const char *key, const char *val)
+ {
+-    const AVOption *o;
++    const AVOption *o = NULL;
+     int ret;
+ 
+     ret = av_opt_set(f, key, val, AV_OPT_SEARCH_CHILDREN);
+-- 
+2.41.0
+

diff --git a/ffmpeg.spec b/ffmpeg.spec
index f8c7684..d68704b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -92,7 +92,7 @@ Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
 Version:        6.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
 URL:            https://ffmpeg.org/
@@ -125,6 +125,10 @@ Patch5:         0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
 # Fix assembly with binutils 2.41 https://fftrac-bg.ffmpeg.org/ticket/10405
 Patch6:         0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
 
+# Backport fix for segfault when passing non-existent filter option
+# See: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6773
+Patch7:         0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
+
 # Set up dlopen for openh264
 Patch1001:      ffmpeg-dlopen-openh264.patch
 
@@ -857,6 +861,10 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %changelog
+* Sun Oct 08 2023 Dominik Mierzejewski <dominik@greysector.net> - 6.0-15
+- Backport upstream patch to fix segfault when passing non-existent filter
+  option (rfbz#6773)
+
 * Sat Oct 07 2023 Sandro Mani <manisandro@gmail.com> - 6.0-14
 - Rebuild (tesseract)