From 002b283433dd70db8c89cb2c465af6a4b30fab89 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jun 2010 10:51:07 +0200 Subject: configure.ac: check ffmpeg version number with pkg-config Replace the check for avcodec_decode_audio2(), assume it's present in libavcodec version 51. --- configure.ac | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index c1d3bcd53..3bf956b69 100644 --- a/configure.ac +++ b/configure.ac @@ -725,17 +725,9 @@ AM_CONDITIONAL(HAVE_FAAD, test x$enable_aac = xyes) AM_CONDITIONAL(HAVE_MP4, test x$enable_mp4 = xyes) dnl ---------------------------------- ffmpeg --------------------------------- -MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat libavcodec libavutil], +MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat >= 52 libavcodec >= 51 libavutil >= 49], [ffmpeg decoder library], [libavformat+libavcodec+libavutil not found]) -if test x$enable_ffmpeg = xyes; then - old_LIBS=$LIBS - LIBS="$LIBS $FFMPEG_LIBS" - AC_CHECK_LIB(avcodec, avcodec_decode_audio2,, - enable_ffmpeg=no) - LIBS=$old_LIBS -fi - if test x$enable_ffmpeg = xyes; then # prior to ffmpeg svn12865, you had to specify include files # without path prefix -- cgit v1.2.3