From b699341ac953ecf68418957b762d4d633f4520ac Mon Sep 17 00:00:00 2001 From: "U. Artie Eoff" Date: Tue, 12 Mar 2024 12:04:01 -0400 Subject: [PATCH] libav: guard dropped AV_CODEC_ID_AYUV api The FF_API_AYUV_CODECID api was dropped in upstream: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/9ee59b63f5ea Part-of: --- subprojects/gst-libav/ext/libav/gstavviddec.c | 5 +++-- subprojects/gst-libav/ext/libav/gstavvidenc.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/subprojects/gst-libav/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c index 3cd2d4f409..cf73dff632 100644 --- a/subprojects/gst-libav/ext/libav/gstavviddec.c +++ b/subprojects/gst-libav/ext/libav/gstavviddec.c @@ -2686,9 +2686,10 @@ gst_ffmpegviddec_register (GstPlugin * plugin) in_plugin->id == AV_CODEC_ID_V210X || in_plugin->id == AV_CODEC_ID_V308 || in_plugin->id == AV_CODEC_ID_V408 || - in_plugin->id == AV_CODEC_ID_V410 || - in_plugin->id == AV_CODEC_ID_R210 + in_plugin->id == AV_CODEC_ID_V410 || in_plugin->id == AV_CODEC_ID_R210 +#if LIBAVCODEC_VERSION_MAJOR < 61 || in_plugin->id == AV_CODEC_ID_AYUV +#endif || in_plugin->id == AV_CODEC_ID_Y41P || in_plugin->id == AV_CODEC_ID_012V || in_plugin->id == AV_CODEC_ID_YUV4 diff --git a/subprojects/gst-libav/ext/libav/gstavvidenc.c b/subprojects/gst-libav/ext/libav/gstavvidenc.c index b323ca0148..461263b4f6 100644 --- a/subprojects/gst-libav/ext/libav/gstavvidenc.c +++ b/subprojects/gst-libav/ext/libav/gstavvidenc.c @@ -1011,9 +1011,10 @@ gst_ffmpegvidenc_register (GstPlugin * plugin) in_plugin->id == AV_CODEC_ID_V210X || in_plugin->id == AV_CODEC_ID_V308 || in_plugin->id == AV_CODEC_ID_V408 || - in_plugin->id == AV_CODEC_ID_V410 || - in_plugin->id == AV_CODEC_ID_R210 + in_plugin->id == AV_CODEC_ID_V410 || in_plugin->id == AV_CODEC_ID_R210 +#if LIBAVCODEC_VERSION_MAJOR < 61 || in_plugin->id == AV_CODEC_ID_AYUV +#endif || in_plugin->id == AV_CODEC_ID_Y41P || in_plugin->id == AV_CODEC_ID_012V || in_plugin->id == AV_CODEC_ID_YUV4