diff options
Diffstat (limited to '')
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 13 insertions, 5 deletions
@@ -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" |