[vlc-commits] avcodec: better fix for missing FourCC in libav

Steve Lhomme git at videolan.org
Sat Mar 2 20:02:05 CET 2019


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Feb 21 17:12:37 2018 +0100| [9f7eea43b87874c6693d2cf33853c314438b5116] | committer: Rémi Denis-Courmont

avcodec: better fix for missing FourCC in libav

(cherry picked from commit b39336e40236f83fd7928d5267da7432255642c6)
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9f7eea43b87874c6693d2cf33853c314438b5116
---

 modules/codec/avcodec/fourcc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 628d384376..33c6cae09a 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -182,7 +182,7 @@ 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_CHECK( 54, 999, 999, 50, 100 )
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
     { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
 #endif
     /* AV_CODEC_ID_DPX */



More information about the vlc-commits mailing list