From 064bb789d7bc0778d7324279460f63c9da84ec4a Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Mon, 13 Aug 2012 23:10:55 -0500 Subject: [PATCH] Increase libavutil version required to use PIX_FMT_YUVA444P. PIX_FMT_YUVA444P was added to ffmpeg in version 51.35.101 - and so the precompiler check was correctly set to that version. However, it has not yet been added to libav. And libav recently increased the libavutil version to 51.38.0. This causes a compilation error against libav master because the precompiler check passes, but PIX_FMT_YUVA444P is not defined. The current libavutil versions are: * ffmpeg master: 51.69.100 * ffmpeg 0.11: 51.54.100 * libav master: 51.38.0 This commit sets the precompiler to check against version 51.54.0. This will allow PIX_FMT_YUVA444P to be used when compiled against both ffmpeg master and ffmpeg 0.11 - while avoiding errors when compiling against libav master. However, if libav keeps incrementing the version without adding PIX_FMT_YUVA444P, this number may have to be increased again in the future. --- src/modules/avformat/producer_avformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c index 85cf346a..97c6eb30 100644 --- a/src/modules/avformat/producer_avformat.c +++ b/src/modules/avformat/producer_avformat.c @@ -1248,7 +1248,7 @@ static void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, // extract alpha from planar formats if ( ( pix_fmt == PIX_FMT_YUVA420P -#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(35<<8)+101) +#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(54<<8)+0) || pix_fmt == PIX_FMT_YUVA444P #endif ) && -- 2.39.2