commit e07b1727b53b955a30d211d6f82c7b779fc70679
parent ad64a88614401b271e868ec54652acd2eaa15521
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 11 Oct 2012 13:52:22 +0000
-be more picky about ffmpeg library version
Diffstat:
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Oct 11 15:51:06 CEST 2012
+ Fixing test for ffmpeg to not accept ancient ffmpeg library. -CG
+
Thu Oct 11 09:19:42 CEST 2012
Fixing archive-plugin crash on ".lnk" files (#2586). -bratao
diff --git a/configure.ac b/configure.ac
@@ -569,7 +569,8 @@ if test x$ffmpeg_enabled = x1
then
ffmpeg_enabled=0
AC_CHECK_LIB(swscale, sws_getContext,
- ffmpeg_enabled=1)
+ AC_CHECK_LIB(avcodec, avcodec_alloc_context3,
+ ffmpeg_enabled=1))
AC_CHECK_HEADERS([libavutil/avutil.h ffmpeg/avutil.h libavformat/avformat.h ffmpeg/avformat.h libavcodec/avcodec.h ffmpeg/avcodec.h libswscale/swscale.h ffmpeg/swscale.h])
fi
AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0)