Reword work-around-abi-break.patch

Reviewed-on: jengelh/ffmpeg-7#20

ffmpeg-7.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Wed Jul 23 13:28:49 UTC 2025 - Hans-Peter Jansen <hp@urpla.net>
+
+- Add vvenc build conditional
+
+-------------------------------------------------------------------
+Wed Jul 23 07:01:22 UTC 2025 - SongChuan Kang <sckang@suse.com>
+
+- Add ffmpeg-CVE-2025-7700.patch: Add check for the return value
+  of av_malloc_array() and av_calloc() to avoid potential NULL
+  pointer dereference(CVE-2025-7700, bsc#1246790).
+
+-------------------------------------------------------------------
+Wed Jun 25 08:40:15 UTC 2025 - Yifan Jiang <yfjiang@suse.com>
+
+- Built with noopenh264, drop ffmpeg-dlopen-openh264.patch
+  (jsc#PED-12607)
+
+-------------------------------------------------------------------
+Thu Jun 12 17:48:49 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Enable libiec61883 integration [boo#1244453]
+
 -------------------------------------------------------------------
 Fri Apr  4 09:34:14 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
 

ffmpeg-7.spec

@@ -60,6 +60,7 @@
 %bcond_with    fdk_aac_dlopen
 %bcond_with    opencore
 %bcond_with    smbclient
+%bcond_with    vvenc
 %bcond_with    x264
 %bcond_with    x265
 %bcond_with    xvid
@@ -118,16 +119,15 @@ Patch3:         ffmpeg-codec-choice.diff
 Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch
 Patch5:         work-around-abi-break.patch
 Patch10:        ffmpeg-chromium.patch
-Patch91:        ffmpeg-dlopen-openh264.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:  libmp3lame-devel >= 3.98.3
 BuildRequires:  nasm
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(aom) >= 1.0.0
 BuildRequires:  pkgconfig(dav1d) >= 0.5.0
@@ -138,6 +138,7 @@ BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libass) >= 0.11.0
+BuildRequires:  pkgconfig(libavc1394)
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libbs2b)
 BuildRequires:  pkgconfig(libcdio)
@@ -145,6 +146,8 @@ BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libgme)
+BuildRequires:  pkgconfig(libiec61883)
+BuildRequires:  pkgconfig(libmp3lame) >= 3.98.3
 BuildRequires:  pkgconfig(libopenjp2) >= 2.1.0
 BuildRequires:  pkgconfig(libopenmpt) >= 0.2.6557
 BuildRequires:  pkgconfig(libpng)
@@ -161,6 +164,7 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libzmq) >= 4.2.1
 BuildRequires:  pkgconfig(lilv-0)
 BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(openh264)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(sdl2) >= 2.0.1
 BuildRequires:  pkgconfig(soxr)
@@ -185,7 +189,7 @@ BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
 BuildRequires:  AMF-devel
 %endif
 %if %{with mysofa}
-BuildRequires:  libmysofa-devel
+BuildRequires:  pkgconfig(libmysofa)
 %endif
 %if %{with codec2}
 BuildRequires:  pkgconfig(codec2)
@@ -219,6 +223,9 @@ BuildRequires:  pkgconfig(opencore-amrnb)
 %if %{with amrwb}
 BuildRequires:  pkgconfig(vo-amrwbenc)
 %endif
+%if %{with vvenc}
+BuildRequires:  vvenc-devel
+%endif
 %if %{with x264}
 BuildRequires:  pkgconfig(x264)
 %endif
@@ -590,6 +597,7 @@ LDFLAGS="%_lto_cflags" \
 	--enable-libfreetype \
 	--enable-libfribidi \
 	--enable-libgsm \
+	--enable-libiec61883 \
 	--enable-libjack \
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150700
 	--enable-libjxl \
@@ -601,7 +609,7 @@ LDFLAGS="%_lto_cflags" \
 %endif
 	--enable-libopenjpeg \
 	--enable-libopenmpt \
-	--enable-libopenh264-dlopen \
+	--enable-libopenh264 \
 	--enable-libopus \
 	--enable-libpulse \
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
@@ -658,6 +666,9 @@ LDFLAGS="%_lto_cflags" \
 %if %{with amrwb}
 	--enable-libvo-amrwbenc \
 %endif
+%if %{with vvenc}
+	--enable-libvvenc \
+%endif
 %if %{with x264}
 	--enable-libx264 \
 %endif
@@ -832,9 +843,9 @@ Patch3:         ffmpeg-codec-choice.diff
 Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch
 Patch5:         work-around-abi-break.patch
 Patch10:        ffmpeg-chromium.patch
-Patch91:        ffmpeg-dlopen-openh264.patch
 Patch15:        11013-avcodec-decode-clean-up-if-get_hw_frames_parameters-.patch
 BuildRequires:  c_compiler
+BuildRequires:  pkgconfig(openh264)
 Requires:       this-is-only-for-build-envs
 
 %description

ffmpeg-CVE-2025-7700.patch

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

ffmpeg-dlopen-openh264.patch

@@ -1,354 +0,0 @@
-From 4739b0c97b3378bdaf737171777fe9a71a53eff1 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa@fedoraproject.org>
-Date: Wed, 12 Oct 2022 09:41:27 -0400
-Subject: [PATCH] avcodec/openh264: Add the ability to dlopen() OpenH264
-
-We can't directly depend on OpenH264, but we can weakly link to it
-and gracefully expose the capability.
-
-Co-authored-by: Andreas Schneider <asn@cryptomilk.org>
-Co-authored-by: Neal Gompa <ngompa@fedoraproject.org>
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-Signed-off-by: Neal Gompa <ngompa@fedoraproject.org>
----
- configure                       |    3 
- libavcodec/Makefile             |    1 
- libavcodec/libopenh264.c        |    5 +
- libavcodec/libopenh264_dlopen.c |  147 ++++++++++++++++++++++++++++++++++++++++
- libavcodec/libopenh264_dlopen.h |   58 +++++++++++++++
- libavcodec/libopenh264dec.c     |    8 ++
- libavcodec/libopenh264enc.c     |    8 ++
- 7 files changed, 230 insertions(+)
- create mode 100644 libavcodec/libopenh264_dlopen.c
- create mode 100644 libavcodec/libopenh264_dlopen.h
-
-Index: ffmpeg-7.1/configure
-===================================================================
---- ffmpeg-7.1.orig/configure
-+++ ffmpeg-7.1/configure
-@@ -255,6 +255,7 @@ External library support:
-   --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
-   --enable-libopencv       enable video filtering via libopencv [no]
-   --enable-libopenh264     enable H.264 encoding via OpenH264 [no]
-+  --enable-libopenh264-dlopen  enable H.264 encoding via dlopen()'ed OpenH264 [no]
-   --enable-libopenjpeg     enable JPEG 2000 encoding via OpenJPEG [no]
-   --enable-libopenmpt      enable decoding tracked files via libopenmpt [no]
-   --enable-libopenvino     enable OpenVINO as a DNN module backend
-@@ -1939,6 +1940,7 @@ EXTERNAL_LIBRARY_LIST="
-     libmysofa
-     libopencv
-     libopenh264
-+    libopenh264_dlopen
-     libopenjpeg
-     libopenmpt
-     libopenvino
-@@ -6966,6 +6968,7 @@ enabled libopencv         && { check_hea
-                                  require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config libopenh264 "openh264 >= 1.3.0" wels/codec_api.h WelsGetCodecVersion
-+enabled libopenh264_dlopen && enable libopenh264 && add_cppflags "-I$(dirname $(readlink -f "$0"))/ffdlopenhdrs/include -DCONFIG_LIBOPENH264_DLOPEN=1"
- enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
-                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
- enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
-Index: ffmpeg-7.1/libavcodec/Makefile
-===================================================================
---- ffmpeg-7.1.orig/libavcodec/Makefile
-+++ ffmpeg-7.1/libavcodec/Makefile
-@@ -1138,6 +1138,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER)
- OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER)  += libopencore-amr.o
- OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER)  += libopencore-amr.o
- OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER)  += libopencore-amr.o
-+OBJS-$(CONFIG_LIBOPENH264_DLOPEN)         += libopenh264_dlopen.o
- OBJS-$(CONFIG_LIBOPENH264_DECODER)        += libopenh264dec.o libopenh264.o
- OBJS-$(CONFIG_LIBOPENH264_ENCODER)        += libopenh264enc.o libopenh264.o
- OBJS-$(CONFIG_LIBOPENJPEG_ENCODER)        += libopenjpegenc.o
-Index: ffmpeg-7.1/libavcodec/libopenh264.c
-===================================================================
---- ffmpeg-7.1.orig/libavcodec/libopenh264.c
-+++ ffmpeg-7.1/libavcodec/libopenh264.c
-@@ -20,8 +20,13 @@
-  */
- 
- #include <string.h>
-+
-+#ifdef CONFIG_LIBOPENH264_DLOPEN
-+#include "libopenh264_dlopen.h"
-+#else
- #include <wels/codec_api.h>
- #include <wels/codec_ver.h>
-+#endif
- 
- #include "libavutil/error.h"
- #include "libavutil/log.h"
-Index: ffmpeg-7.1/libavcodec/libopenh264_dlopen.c
-===================================================================
---- /dev/null
-+++ ffmpeg-7.1/libavcodec/libopenh264_dlopen.c
-@@ -0,0 +1,147 @@
-+/*
-+ * OpenH264 dlopen code
-+ *
-+ * Copyright (C) 2022 Andreas Schneider <asn@cryptomilk.org>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include <dlfcn.h>
-+
-+#include "libopenh264_dlopen.h"
-+
-+/*
-+ * The symbol binding makes sure we do not run into strict aliasing issues which
-+ * can lead into segfaults.
-+ */
-+typedef int (*__oh264_WelsCreateSVCEncoder)(ISVCEncoder **);
-+typedef void (*__oh264_WelsDestroySVCEncoder)(ISVCEncoder *);
-+typedef int (*__oh264_WelsGetDecoderCapability)(SDecoderCapability *);
-+typedef long (*__oh264_WelsCreateDecoder)(ISVCDecoder **);
-+typedef void (*__oh264_WelsDestroyDecoder)(ISVCDecoder *);
-+typedef OpenH264Version (*__oh264_WelsGetCodecVersion)(void);
-+typedef void (*__oh264_WelsGetCodecVersionEx)(OpenH264Version *);
-+
-+#define OH264_SYMBOL_ENTRY(i)                                                  \
-+  union {                                                                      \
-+    __oh264_##i f;                                                             \
-+    void *obj;                                                                 \
-+  } _oh264_##i
-+
-+struct oh264_symbols {
-+  OH264_SYMBOL_ENTRY(WelsCreateSVCEncoder);
-+  OH264_SYMBOL_ENTRY(WelsDestroySVCEncoder);
-+  OH264_SYMBOL_ENTRY(WelsGetDecoderCapability);
-+  OH264_SYMBOL_ENTRY(WelsCreateDecoder);
-+  OH264_SYMBOL_ENTRY(WelsDestroyDecoder);
-+  OH264_SYMBOL_ENTRY(WelsGetCodecVersion);
-+  OH264_SYMBOL_ENTRY(WelsGetCodecVersionEx);
-+};
-+
-+/* Symbols are bound by loadLibOpenH264() */
-+static struct oh264_symbols openh264_symbols;
-+
-+int oh264_WelsCreateSVCEncoder(ISVCEncoder **ppEncoder) {
-+  return openh264_symbols._oh264_WelsCreateSVCEncoder.f(ppEncoder);
-+}
-+
-+void oh264_WelsDestroySVCEncoder(ISVCEncoder *pEncoder) {
-+  return openh264_symbols._oh264_WelsDestroySVCEncoder.f(pEncoder);
-+}
-+
-+int oh264_WelsGetDecoderCapability(SDecoderCapability *pDecCapability) {
-+  return openh264_symbols._oh264_WelsGetDecoderCapability.f(pDecCapability);
-+}
-+
-+long oh264_WelsCreateDecoder(ISVCDecoder **ppDecoder) {
-+  return openh264_symbols._oh264_WelsCreateDecoder.f(ppDecoder);
-+}
-+
-+void oh264_WelsDestroyDecoder(ISVCDecoder *pDecoder) {
-+  return openh264_symbols._oh264_WelsDestroyDecoder.f(pDecoder);
-+}
-+
-+OpenH264Version oh264_WelsGetCodecVersion(void) {
-+  return openh264_symbols._oh264_WelsGetCodecVersion.f();
-+}
-+
-+void oh264_WelsGetCodecVersionEx(OpenH264Version *pVersion) {
-+  openh264_symbols._oh264_WelsGetCodecVersionEx.f(pVersion);
-+}
-+
-+static void *_oh264_bind_symbol(AVCodecContext *avctx,
-+                                void *handle,
-+                                const char *sym_name) {
-+    void *sym = NULL;
-+
-+    sym = dlsym(handle, sym_name);
-+    if (sym == NULL) {
-+        const char *err = dlerror();
-+        av_log(avctx,
-+               AV_LOG_WARNING,
-+               "%s: Failed to bind %s\n",
-+               err,
-+               sym_name);
-+        return NULL;
-+    }
-+
-+    return sym;
-+}
-+
-+#define oh264_bind_symbol(avctx, handle, sym_name)                           \
-+  if (openh264_symbols._oh264_##sym_name.obj == NULL) {                      \
-+    openh264_symbols._oh264_##sym_name.obj = _oh264_bind_symbol(avctx, handle, #sym_name); \
-+    if (openh264_symbols._oh264_##sym_name.obj == NULL) {                    \
-+      return 1;                                                              \
-+    }                                                                        \
-+  }
-+
-+int loadLibOpenH264(AVCodecContext *avctx) {
-+  static bool initialized = false;
-+  void *libopenh264 = NULL;
-+  const char *err = NULL;
-+
-+  if (initialized) {
-+      return 0;
-+  }
-+
-+#define OPENH264_LIB "libopenh264.so.7"
-+  libopenh264 = dlopen(OPENH264_LIB, RTLD_LAZY);
-+  err = dlerror();
-+  if (err != NULL) {
-+    av_log(avctx, AV_LOG_WARNING,
-+           "%s: %s is missing, openh264 support will be disabled\n", err,
-+           OPENH264_LIB);
-+
-+    if (libopenh264 != NULL) {
-+      dlclose(libopenh264);
-+    }
-+    return 1;
-+  }
-+
-+  oh264_bind_symbol(avctx, libopenh264, WelsCreateSVCEncoder);
-+  oh264_bind_symbol(avctx, libopenh264, WelsDestroySVCEncoder);
-+  oh264_bind_symbol(avctx, libopenh264, WelsGetDecoderCapability);
-+  oh264_bind_symbol(avctx, libopenh264, WelsCreateDecoder);
-+  oh264_bind_symbol(avctx, libopenh264, WelsDestroyDecoder);
-+  oh264_bind_symbol(avctx, libopenh264, WelsGetCodecVersion);
-+  oh264_bind_symbol(avctx, libopenh264, WelsGetCodecVersionEx);
-+
-+  initialized = true;
-+
-+  return 0;
-+}
-Index: ffmpeg-7.1/libavcodec/libopenh264_dlopen.h
-===================================================================
---- /dev/null
-+++ ffmpeg-7.1/libavcodec/libopenh264_dlopen.h
-@@ -0,0 +1,58 @@
-+/*
-+ * OpenH264 dlopen code
-+ *
-+ * Copyright (C) 2022 Andreas Schneider <asn@cryptomilk.org>
-+ *
-+ * This file is part of FFmpeg.
-+ *
-+ * FFmpeg is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * FFmpeg is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with FFmpeg; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifndef HAVE_LIBOPENH264_DLOPEN_H
-+#define HAVE_LIBOPENH264_DLOPEN_H
-+
-+#ifdef CONFIG_LIBOPENH264_DLOPEN
-+
-+#include <wels/codec_api.h>
-+#include <wels/codec_ver.h>
-+
-+#include "avcodec.h"
-+
-+int oh264_WelsCreateSVCEncoder(ISVCEncoder **ppEncoder);
-+#define WelsCreateSVCEncoder oh264_WelsCreateSVCEncoder
-+
-+void oh264_WelsDestroySVCEncoder(ISVCEncoder *pEncoder);
-+#define WelsDestroySVCEncoder oh264_WelsDestroySVCEncoder
-+
-+int oh264_WelsGetDecoderCapability(SDecoderCapability *pDecCapability);
-+#define WelsGetDecoderCapability oh264_WelsGetDecoderCapability
-+
-+long oh264_WelsCreateDecoder(ISVCDecoder **ppDecoder);
-+#define WelsCreateDecoder oh264_WelsCreateDecoder
-+
-+void oh264_WelsDestroyDecoder(ISVCDecoder *pDecoder);
-+#define WelsDestroyDecoder oh264_WelsDestroyDecoder
-+
-+OpenH264Version oh264_WelsGetCodecVersion(void);
-+#define WelsGetCodecVersion oh264_WelsGetCodecVersion
-+
-+void oh264_WelsGetCodecVersionEx(OpenH264Version *pVersion);
-+#define WelsGetCodecVersionEx oh264_WelsGetCodecVersionEx
-+
-+int loadLibOpenH264(AVCodecContext *avctx);
-+
-+#endif /* CONFIG_LIBOPENH264_DLOPEN */
-+
-+#endif /* HAVE_LIBOPENH264_DLOPEN_H */
-Index: ffmpeg-7.1/libavcodec/libopenh264dec.c
-===================================================================
---- ffmpeg-7.1.orig/libavcodec/libopenh264dec.c
-+++ ffmpeg-7.1/libavcodec/libopenh264dec.c
-@@ -19,8 +19,12 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
-+#ifdef CONFIG_LIBOPENH264_DLOPEN
-+#include "libopenh264_dlopen.h"
-+#else
- #include <wels/codec_api.h>
- #include <wels/codec_ver.h>
-+#endif
- 
- #include "libavutil/common.h"
- #include "libavutil/fifo.h"
-@@ -55,6 +59,10 @@ static av_cold int svc_decode_init(AVCod
-     int log_level;
-     WelsTraceCallback callback_function;
- 
-+#ifdef CONFIG_LIBOPENH264_DLOPEN
-+    if (loadLibOpenH264(avctx))
-+         return AVERROR_DECODER_NOT_FOUND;
-+#endif
-     if (WelsCreateDecoder(&s->decoder)) {
-         av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
-         return AVERROR_UNKNOWN;
-Index: ffmpeg-7.1/libavcodec/libopenh264enc.c
-===================================================================
---- ffmpeg-7.1.orig/libavcodec/libopenh264enc.c
-+++ ffmpeg-7.1/libavcodec/libopenh264enc.c
-@@ -19,8 +19,12 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
-+#ifdef CONFIG_LIBOPENH264_DLOPEN
-+#include "libopenh264_dlopen.h"
-+#else
- #include <wels/codec_api.h>
- #include <wels/codec_ver.h>
-+#endif
- 
- #include "libavutil/attributes.h"
- #include "libavutil/common.h"
-@@ -114,6 +118,10 @@ static av_cold int svc_encode_init(AVCod
-     WelsTraceCallback callback_function;
-     AVCPBProperties *props;
- 
-+#ifdef CONFIG_LIBOPENH264_DLOPEN
-+    if (loadLibOpenH264(avctx))
-+         return AVERROR_ENCODER_NOT_FOUND;
-+#endif
-     if (WelsCreateSVCEncoder(&s->encoder)) {
-         av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
-         return AVERROR_UNKNOWN;

work-around-abi-break.patch

@@ -13,11 +13,12 @@ ffmpeg, which can cause inadvertent mixing of library versions on
 openSUSE, and precompiled Linux distributions in general.
 
 Upstream says "we only add new functions" - which is ok in its own
-right. verdefs, if you have them, *must*not* change under any
-circumstances, but that is what they broke: the set of symbols
-included in the "LIBAVFORMAT_59" verdef changed between 5.0 and 5.1.
+right. New symbols must be in a new verdef section though, existing
+sections *must*not* change under *any* circumstances, but that is
+what they broke: the set of symbols included in the "LIBAVFORMAT_59"
+verdef changed between 5.0 and 5.1.
 
-$ abidiff abidiff /usr/lib64/libavformat.so.59.16.100 usr/lib64/libavformat.so.59.27.100
+$ abidiff /usr/lib64/libavformat.so.59.16.100 usr/lib64/libavformat.so.59.27.100
 Functions changes summary: 0 Removed, 0 Changed, 0 Added function
 Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 Function symbols changes summary: 0 Removed, 1 Added function symbol not referenced by debug info