From a07fd223d6901a44421482d97648cd3a05c83efb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Cartegnie?= Date: Tue, 23 Apr 2024 13:13:30 +0700 Subject: [PATCH] codec: avcodec: map AYUV as RAWVIDEO with ffmpeg 6.0 (cherry picked from commit 955ef939467a628eb8da08e0d5eaefc9a3484cba) Gbp-Pq: Name 0069-codec-avcodec-map-AYUV-as-RAWVIDEO-with-ffmpeg-6.0.patch --- modules/codec/avcodec/fourcc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 }, -- 2.30.2