mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-08 06:00:36 +02:00
307bfb0663
* gnu/packages/patches/ffmpeg-svt-av1-v3.patch, gnu/packages/patches/x265-4-arm-flags.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/video.scm (x265-4, svt-av1-3, ffmpeg-handbrake) (ffmpeg-x265): New variables. (handbrake): Upgrade to version 1.10.2. [origin]: Move modules adjustment to ... [arguments]: ... a new 'disable-contrib phase. [native-inputs]: Use new list syntax. Add meson, ninja. [inputs]: Same. "gtk+" -> "gtk", "ffmpeg" -> "ffmpeg-handbrake", "x265" -> "x265-handbrake". Add svt-av1-3. Fixes: guix/guix#2337 Change-Id: Ia0e911e166f96a6f5e28697759a4abfa1a5d5f93
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
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.25.1
|
|
|