From d1e50efdba8df480500024f744ff62a0304c112a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 2 Oct 2018 15:54:19 +0200 Subject: [PATCH] configure: libav - check for libswresample or libavresample, fixes #5235 --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1572c4ff6..201dfba57 100755 --- a/configure +++ b/configure @@ -617,16 +617,17 @@ else if enabled_or_auto libav; then has_libav=true + has_resample=false check_pkg libavfilter ">=6.47.100" || has_libav=false - check_pkg libswresample ">=2.1.100" || has_libav=false - check_pkg libavresample ">=3.0.0" || has_libav=false + check_pkg libswresample ">=2.1.100" && has_resample=true + check_pkg libavresample ">=3.0.0" && has_resample=true check_pkg libswscale ">=4.1.100" || has_libav=false check_pkg libavformat ">=57.41.100" || has_libav=false check_pkg libavcodec ">=57.48.101" || has_libav=false check_pkg libavutil ">=55.28.100" || has_libav=false - if $has_libav; then + if $has_libav -a $has_resample; then enable libav else echo "WARNING: none or old ffmpeg libraries were detected" -- 2.47.2