diff options
author | wm4 <wm4@nowhere> | 2015-01-02 01:43:59 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-01-02 01:43:59 +0100 |
commit | 594114e660a1b7626d8358a2b24fe000166e0ad8 (patch) | |
tree | f2b09436d15b5dfbf659e055c89759de8b718e0f /old-configure | |
parent | 7873301be8a0ed3b6a70c5a32a36e4fa52284ffb (diff) | |
download | mpv-594114e660a1b7626d8358a2b24fe000166e0ad8.tar.bz2 mpv-594114e660a1b7626d8358a2b24fe000166e0ad8.tar.xz |
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).
Diffstat (limited to 'old-configure')
-rwxr-xr-x | old-configure | 10 |
1 files changed, 5 insertions, 5 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 |