From 594114e660a1b7626d8358a2b24fe000166e0ad8 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 2 Jan 2015 01:43:59 +0100
Subject: 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).
---
 wscript | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'wscript')

diff --git a/wscript b/wscript
index 98b8eab1ea..d754199f82 100644
--- a/wscript
+++ b/wscript
@@ -385,15 +385,15 @@ libav_dependencies = [
         'req': True,
         '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',
-- 
cgit v1.2.3