build: prefer libswresample over libavresample on FFmpeg

I hoped we could always use libavresample, but the FFmpeg project is
being too dickish to enable libavresample by default - which means we
need our libswresample-to-libavresample hack anyway.

Give up, and use the "supported" one of the duplicated libraries when
compiling against FFmpeg (relying on the fact that libswresample won't
be present if compiling against Libav).

2 files changed, 10 insertions, 10 deletions

diff --git a/old-configure b/old-configure
index 71e08a9aed..5e3dfd52bf 100755
--- a/old-configure
+++ b/old-configure
@@ -751,14 +751,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
diff --git a/wscript b/wscript
index 24bd3afcee..00e0357d64 100644
--- a/wscript
+++ b/wscript
@@ -376,14 +376,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',