]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
configure: libav - check for libswresample or libavresample, fixes #5235
authorJaroslav Kysela <perex@perex.cz>
Tue, 2 Oct 2018 13:54:19 +0000 (15:54 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 2 Oct 2018 13:55:47 +0000 (15:55 +0200)
configure

index d64cd456703ac32a5fddc76d55d2bfb887b38463..7e34493870ee7706927d1af5ac44b77562093382 100755 (executable)
--- a/configure
+++ b/configure
@@ -556,16 +556,17 @@ else
 
   if enabled_or_auto libav; then
     has_libav=true
+    has_resample=false
 
     check_pkg libavfilter   ">=6.31.100"  || has_libav=false
-    check_pkg libswresample ">=2.0.101"   || has_libav=false
-    check_pkg libavresample ">=3.0.0"     || has_libav=false
+    check_pkg libswresample ">=2.0.101"   && has_resample=true
+    check_pkg libavresample ">=3.0.0"     && has_resample=true
     check_pkg libswscale    ">=4.0.100"   || has_libav=false
     check_pkg libavformat   ">=57.25.100" || has_libav=false
     check_pkg libavcodec    ">=57.24.102" || has_libav=false
     check_pkg libavutil     ">=55.17.103" || 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"