From f8f510e50b4699e7c95fdd982990454aa4ae8dae Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 13 Jul 2018 12:11:48 -0400 Subject: [PATCH] Update libav dependency version check. --- meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 28fd04f3a8..cea26e8f49 100644 --- a/meson.build +++ b/meson.build @@ -30,10 +30,9 @@ if not meson.is_subproject() and cc.get_id() == 'msvc' endif endif -# FIXME Remove that check once we have ffmpeg as a gst-libav subproject libav_opt = get_option('libav') -libav_deps = [dependency('libavfilter', version: '>= 6.47.100', required: libav_opt)] -if libav_deps[0].found() +libav_deps = [dependency('libavfilter', version: '>= 7.16.100', fallback: ['FFmpeg', 'libavfilter_dep'])] +if libav_deps[0].found() and libav_deps[0].type_name() != 'internal' cc = meson.get_compiler('c') check_ffmpeg_src = '''#include #if LIBAVCODEC_VERSION_MICRO >= 100 -- 2.34.1