ffmpeg-7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  1 01:01:01 UTC 2025 - olaf@aepfle.de
+
+- Unbreak build for X265_BUILD >= 213 with ffmpeg-7.patch
+
 -------------------------------------------------------------------
 Tue Mar 25 11:48:21 UTC 2025 - Adrian Schröter <adrian@suse.de>
 

ffmpeg-7.patch

@@ -0,0 +1,33 @@
+---
+ libavcodec/libx265.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/libavcodec/libx265.c
++++ b/libavcodec/libx265.c
+@@ -661,7 +661,7 @@
+ {
+     libx265Context *ctx = avctx->priv_data;
+     x265_picture x265pic;
+-#if X265_BUILD >= 210
++#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+     x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
+     x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
+ #else
+@@ -805,7 +805,7 @@
+ #endif
+     }
+ 
+-#if X265_BUILD >= 210
++#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+     for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
+         x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
+ 
+@@ -844,7 +844,7 @@
+             pkt->flags |= AV_PKT_FLAG_KEY;
+     }
+ 
+-#if X265_BUILD >= 210
++#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+     x265pic_out = x265pic_lyrptr_out[0];
+ #else
+     x265pic_out = &x265pic_solo_out;

ffmpeg-7.spec

@@ -840,6 +840,7 @@ Source:         https://www.ffmpeg.org/releases/%_name-%version.tar.xz
 Source2:        https://www.ffmpeg.org/releases/%_name-%version.tar.xz.asc
 Source3:        ffmpeg-7-rpmlintrc
 Source98:       http://ffmpeg.org/ffmpeg-devel.asc#/ffmpeg-7.keyring
+Patch0:         %name.patch
 Patch1:         ffmpeg-arm6l.diff
 Patch3:         ffmpeg-codec-choice.diff
 Patch4:         ffmpeg-4.2-dlopen-fdk_aac.patch