From: François Cartegnie <fcvlcdev@free.fr>
Date: Tue, 23 Apr 2024 06:13:30 +0000 (+0700)
Subject: codec: avcodec: map AYUV as RAWVIDEO with ffmpeg 6.0
X-Git-Tag: archive/raspbian/3.0.21-2+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=126f857270566cf4efb91682f7cb46ddb429852b;p=vlc.git

codec: avcodec: map AYUV as RAWVIDEO with ffmpeg 6.0

(cherry picked from commit 955ef939467a628eb8da08e0d5eaefc9a3484cba)

Gbp-Pq: Name 0008-codec-avcodec-map-AYUV-as-RAWVIDEO-with-ffmpeg-6.0.patch
---

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 33c6cae0..97f31882 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -182,8 +182,12 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
     /* AV_CODEC_ID_V210X */
     { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
     { VLC_CODEC_V210, AV_CODEC_ID_V210 },
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
+#if LIBAVCODEC_VERSION_MICRO >= 100
+# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 59, 42, 102 )
+    { VLC_CODEC_VUYA, AV_CODEC_ID_RAWVIDEO },
+# elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 )
     { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
+# endif
 #endif
     /* AV_CODEC_ID_DPX */
     { VLC_CODEC_MAD, AV_CODEC_ID_MAD },