diff options
| -rwxr-xr-x | old-configure | 10 | ||||
| -rw-r--r-- | wscript | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/old-configure b/old-configure index 8fdb6168a4..9859a31f28 100755 --- a/old-configure +++ b/old-configure @@ -747,14 +747,14 @@ check_pkg_config "FFmpeg/Libav" $_ffmpeg FFMPEG \ "libavutil >= 52.48.101 libavcodec >= 55.34.1 libavformat >= 55.12.0 libswscale >= 2.1.2" test $(defretval) = no && die "Unable to find development files for some of the required Libav libraries above. Aborting." -check_pkg_config "Libavresample" $_libavresample LIBAVRESAMPLE 'libavresample >= 1.1.0' -_libavresample=$(defretval) - -_libswresample=auto -test $_libavresample = yes && _libswresample=no check_pkg_config "Libswresample" $_libswresample LIBSWRESAMPLE 'libswresample >= 0.17.104' _libswresample=$(defretval) +_libavresample=auto +test $_libswresample = yes && _libavresample=no +check_pkg_config "Libavresample" $_libavresample LIBAVRESAMPLE 'libavresample >= 1.1.0' +_libavresample=$(defretval) + if test "$_libswresample" = no && test "$_libavresample" = no ; then die "No resampler found. Install libavresample or libswresample (FFmpeg)." fi @@ -386,14 +386,14 @@ libav_dependencies = [ 'fmsg': "Unable to find development files for some of the required \ Libav libraries ({0}). Aborting.".format(" ".join(libav_pkg_config_checks)) }, { - 'name': '--libavresample', - 'desc': 'libavresample', - 'func': check_pkg_config('libavresample', '>= 1.1.0'), - }, { 'name': '--libswresample', 'desc': 'libswresample', 'func': check_pkg_config('libswresample', '>= 0.17.104'), - 'deps_neg': ['libavresample'], + }, { + 'name': '--libavresample', + 'desc': 'libavresample', + 'func': check_pkg_config('libavresample', '>= 1.1.0'), + 'deps_neg': ['libswresample'], }, { 'name': 'resampler', 'desc': 'usable resampler found', |