From 5834843b8ad3ccc6088d0126a171ffd4a721e03c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 2 Aug 2016 19:15:23 +0200 Subject: [PATCH] decoder/ffmpeg: fix the AVCodecParameters API check Turns out the libavcodec version numbers are not linear; the feature was added in FFmpeg 3.1 commit 998e1b8, libavcodec 57.14.0; but FFmpeg 3.0 has version 57.48.101. Ouch! --- src/decoder/plugins/FfmpegDecoderPlugin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 0b85122f0..7695dcb4f 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -86,7 +86,7 @@ ffmpeg_init(gcc_unused const config_param ¶m) return true; } -#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 5, 0) +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 25, 0) /* FFmpeg 3.1 */ gcc_pure static const AVCodecParameters &