mirror of
https://github.com/termux/termux-packages.git
synced 2025-02-07 20:10:04 +00:00
96616601d0
Patches copied from f0ead348a0
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
Copied from https://salsa.debian.org/multimedia-team/vlc/-/commit/f0ead348a0d2739c6e097938e7fd20db39c6fc59
|
|
|
|
From: =?utf-8?q?Fran=C3=A7ois_Cartegnie?= <fcvlcdev@free.fr>
|
|
Date: Tue, 23 Apr 2024 13:13:30 +0700
|
|
Subject: codec: avcodec: map AYUV as RAWVIDEO with ffmpeg 6.0
|
|
|
|
(cherry picked from commit 955ef939467a628eb8da08e0d5eaefc9a3484cba)
|
|
---
|
|
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 33c6cae..97f3188 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 },
|