aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-10-11 13:52:22 +0000
committerChristian Grothoff <christian@grothoff.org>2012-10-11 13:52:22 +0000
commite07b1727b53b955a30d211d6f82c7b779fc70679 (patch)
treeb3e03612d651c3f9445b239244db3ef54a2475f6
parentad64a88614401b271e868ec54652acd2eaa15521 (diff)
downloadlibextractor-e07b1727b53b955a30d211d6f82c7b779fc70679.tar.gz
libextractor-e07b1727b53b955a30d211d6f82c7b779fc70679.zip
-be more picky about ffmpeg library version
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 458dd17..506b223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Thu Oct 11 15:51:06 CEST 2012
2 Fixing test for ffmpeg to not accept ancient ffmpeg library. -CG
3
1Thu Oct 11 09:19:42 CEST 2012 4Thu Oct 11 09:19:42 CEST 2012
2 Fixing archive-plugin crash on ".lnk" files (#2586). -bratao 5 Fixing archive-plugin crash on ".lnk" files (#2586). -bratao
3 6
diff --git a/configure.ac b/configure.ac
index c5f749a..903a239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,7 +569,8 @@ if test x$ffmpeg_enabled = x1
569then 569then
570 ffmpeg_enabled=0 570 ffmpeg_enabled=0
571 AC_CHECK_LIB(swscale, sws_getContext, 571 AC_CHECK_LIB(swscale, sws_getContext,
572 ffmpeg_enabled=1) 572 AC_CHECK_LIB(avcodec, avcodec_alloc_context3,
573 ffmpeg_enabled=1))
573 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]) 574 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])
574fi 575fi
575AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0) 576AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0)