Only try to include libswresample if it is installed and we have pascal headers for that specific version

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3194 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 13 insertions, 5 deletions

diff --git a/configure b/configure
index 7e0f2274..7687b36c 100755
--- a/configure
+++ b/configure
@@ -7128,7 +7128,9 @@ $as_echo "[$FFMPEG_VERSION]" >&6; }
 
 
 
-# find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode)
+# the first swresample header translation was in ffmpeg 2.1 (avutil 52.48.100)
+if [ "$libavutil_VERSION_MAJOR" -gt 80 ] || ([ "$libavutil_VERSION_MAJOR" -eq 52 ] && [ "$libavutil_VERSION_MINOR" -ge 48 ]); then
+		# find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode)
 
     have_lib="no"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libswresample" >&5
@@ -7362,6 +7364,8 @@ $as_echo "[$FFMPEG_VERSION]" >&6; }
 
 
 
+fi
+
 # find projectM version
 libprojectM_PKG="libprojectM >= 0.98"
 
diff --git a/configure.ac b/configure.ac
index 6a814555..346f0488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,10 +242,14 @@ PKG_HAVE([libswscale], [libswscale], no)
 PKG_VERSION([libswscale], [libswscale])
 AC_SUBST_DEFINE(HAVE_SWSCALE, $libswscale_HAVE)
 
-# find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode)
-PKG_HAVE([libswresample], [libswresample], no)
-PKG_VERSION([libswresample], [libswresample])
-AC_SUBST_DEFINE(HAVE_SWRESAMPLE, $libswresample_HAVE)
+# the first swresample header translation was in ffmpeg 2.1 (avutil 52.48.100)
+if [[ "$libavutil_VERSION_MAJOR" -gt 52 ]] || ([[ "$libavutil_VERSION_MAJOR" -eq 52 ]] && [[ "$libavutil_VERSION_MINOR" -ge 48 ]]); then
+		# find FFMpeg's swresample lib (just if FFMpeg is compiled in GPL mode)
+		PKG_HAVE([libswresample], [libswresample], no)
+		PKG_VERSION([libswresample], [libswresample])
+		AC_SUBST_DEFINE(HAVE_SWRESAMPLE, $libswresample_HAVE)
+	
+fi
 
 # find projectM version
 libprojectM_PKG="libprojectM >= 0.98"