From f35794ef29501d9a0c0ca0e44744b886c6cd93a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?= <francois-simon.fauteux-chapleau@savoirfairelinux.com> Date: Fri, 31 May 2024 11:40:34 -0400 Subject: [PATCH] ffmpeg: add missing includes to pipewiregrab patch The formats.h and video.h header files are needed by the patch but were not explicitly included. They are implicitly included via internal.h in FFmpeg 6.0.1 (the version we currently use in the daemon), but not in later versions (6.1+). (Thanks to Maxim Cournoyer for bringing this problem to my attention.) Change-Id: I99f35fa351f6aeca2091a6ee7c267acec0cb08bb --- contrib/src/ffmpeg/pipewiregrab-source-filter.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/src/ffmpeg/pipewiregrab-source-filter.patch b/contrib/src/ffmpeg/pipewiregrab-source-filter.patch index f2da4f478f..d4a0a61419 100644 --- a/contrib/src/ffmpeg/pipewiregrab-source-filter.patch +++ b/contrib/src/ffmpeg/pipewiregrab-source-filter.patch @@ -72,10 +72,10 @@ index d7db46c2af..87204fec71 100644 extern const AVFilter ff_vsrc_smptebars; diff --git a/libavfilter/vsrc_pipewiregrab.c b/libavfilter/vsrc_pipewiregrab.c new file mode 100644 -index 0000000000..ff9c3468ab +index 0000000000..3ffe38b52f --- /dev/null +++ b/libavfilter/vsrc_pipewiregrab.c -@@ -0,0 +1,1373 @@ +@@ -0,0 +1,1375 @@ +/* + * PipeWire input grabber (ScreenCast) + * Copyright (C) 2024 Savoir-faire Linux, Inc. @@ -127,7 +127,9 @@ index 0000000000..ff9c3468ab +#include "libavformat/internal.h" +#include "libavutil/avassert.h" +#include "avfilter.h" ++#include "formats.h" +#include "internal.h" ++#include "video.h" + +#include <pipewire/pipewire.h> +#include <pipewire/thread-loop.h> -- GitLab