From 048ceef655bce41bc6e215b5e05cec0fad4d1428 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sat, 9 Mar 2013 09:30:26 +0100
Subject: af_lavrresample: add new resampling filter to replace the old ones

Remove `af_resample` and `af_lavcresample`. The former is a mess while the
latter uses an API that was long deprecated in libavcodec and is now removed.

`af_lavrresample` rougly has the same features and structure of
`af_lavcresample`.

libswresample fallback by wm4.
---
 configure | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 15a41ade7f..7413c95498 100755
--- a/configure
+++ b/configure
@@ -342,6 +342,9 @@ Codecs:
   --disable-libbs2b         disable libbs2b audio filter support [autodetect]
   --disable-mpg123          disable libmpg123 MP3 decoding support [autodetect]
 
+Resampler:
+  --disable-libavresample   check for libswresample only [autodetect]
+
 Video output:
   --enable-gl              enable OpenGL video output [autodetect]
   --enable-caca            enable CACA  video output [autodetect]
@@ -416,6 +419,7 @@ _cross_compile=no
 _prefix="/usr/local"
 ffmpeg=auto
 _encoding=yes
+_disable_avresample=no
 _x11=auto
 _wayland=auto
 _xss=auto
@@ -667,6 +671,8 @@ for ac_option do
   --enable-joystick)    _joystick=yes   ;;
   --disable-joystick)   _joystick=no    ;;
   --enable-libav)       ffmpeg=yes      ;;
+  --disable-libavresample) _disable_avresample=yes ;;
+  --enable-libavresample) _disable_avresample=no   ;;
 
   --enable-lirc)        _lirc=yes       ;;
   --disable-lirc)       _lirc=no        ;;
@@ -2682,6 +2688,31 @@ fi
 echores "yes"
 
 
+_resampler=no
+echocheck "libavresample >= 1.0.0"
+if test "$_disable_avresample" = no ; then
+  if pkg_config_add "libavresample >= 1.0.0" ; then
+    _resampler=yes
+    def_resampler='#define CONFIG_LIBAVRESAMPLE'
+  fi
+fi
+echores "$_resampler"
+
+
+if test "$_resampler" = no ; then
+  echocheck "libswresample >= 0.15.100"
+  if pkg_config_add "libswresample >= 0.15.100" ; then
+    _resampler=yes
+    def_resampler='#define CONFIG_LIBSWRESAMPLE'
+  fi
+  echores "$_resampler"
+fi
+
+if test "$_resampler" = no ; then
+  die "No resampler found. Install libavresample or libswresample (FFmpeg)."
+fi
+
+
 echocheck "Libav 0.8 compatibility hack"
 if test "$_encoding" = yes && $_pkg_config "libavcodec >= 54.0.0" ; then
     echores "no"
@@ -3311,6 +3342,7 @@ $def_xv
 
 /* FFmpeg */
 $def_encoding
+$def_resampler
 
 $def_fast_64bit
 $def_pthreads
-- 
cgit v1.2.3