]> 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 14:09:20 +0000 (16:09 +0200)
configure

index 1572c4ff69b850761aa4b8fa6110538e25f77451..201dfba574a40fc10134ba03b0dd854ee25cefc4 100755 (executable)
--- 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"