aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-06-30 21:56:04 +0200
committerMax Kellermann <max@duempel.org>2010-06-30 21:56:04 +0200
commit0d03bdce6d590429143e821e2bcf34142b57b8fa (patch)
treeba995422a4ecf1e8889c3ecd1510f019ae3e5205 /configure.ac
parent768be22f7ca3ef129a86dae23d51e2b34f5b4bc1 (diff)
downloadmpd-0d03bdce6d590429143e821e2bcf34142b57b8fa.tar.gz
mpd-0d03bdce6d590429143e821e2bcf34142b57b8fa.tar.xz
mpd-0d03bdce6d590429143e821e2bcf34142b57b8fa.zip
configure.ac: check ffmpeg version number with pkg-config
Replace the check for avcodec_decode_audio2(), assume it's present in libavcodec version 51.
Diffstat (limited to '')
-rw-r--r--configure.ac10
1 files changed, 1 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 1043b2f65..f2a013720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -914,18 +914,10 @@ fi
AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
-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
old_CPPCFLAGS=$CPPFLAGS