[vlc-commits] avutil: disable 12bit support in libav case

Jean-Baptiste Kempf git at videolan.org
Thu Jul 7 00:09:12 CEST 2016


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jul  7 00:05:06 2016 +0200| [b9340fca2e15b48c29690287cf78795cbada1a77] | committer: Jean-Baptiste Kempf

avutil: disable 12bit support in libav case

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

 modules/codec/avcodec/chroma.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c
index 72adabb..43d6b61 100644
--- a/modules/codec/avcodec/chroma.c
+++ b/modules/codec/avcodec/chroma.c
@@ -86,7 +86,7 @@ static const struct
     {VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 },
     {VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 },
     {VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 },
-#if LIBAVUTIL_VERSION_CHECK(54, 99, 0, 17, 100)
+#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 17, 100 ) )
     {VLC_CODEC_I420_12L, AV_PIX_FMT_YUV420P12LE, 0, 0, 0 },
     {VLC_CODEC_I420_12B, AV_PIX_FMT_YUV420P12BE, 0, 0, 0 },
 #endif
@@ -107,7 +107,7 @@ static const struct
     {VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 },
     {VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 },
     {VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 },
-#if LIBAVUTIL_VERSION_CHECK(54, 99, 0, 17, 100)
+#if (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 54, 17, 100 ) )
     {VLC_CODEC_I444_12L, AV_PIX_FMT_YUV444P12LE, 0, 0, 0 },
     {VLC_CODEC_I444_12B, AV_PIX_FMT_YUV444P12BE, 0, 0, 0 },
 #endif



More information about the vlc-commits mailing list