[GNUnet-SVN] r24265 - Extractor

[gnunet]

Author: grothoff
Date: 2012-10-11 15:52:22 +0200 (Thu, 11 Oct 2012)
New Revision: 24265

Modified:
   Extractor/ChangeLog
   Extractor/configure.ac
Log:
-be more picky about ffmpeg library version

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2012-10-11 13:34:18 UTC (rev 24264)
+++ Extractor/ChangeLog 2012-10-11 13:52:22 UTC (rev 24265)
@@ -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
 

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2012-10-11 13:34:18 UTC (rev 24264)
+++ Extractor/configure.ac      2012-10-11 13:52:22 UTC (rev 24265)
@@ -569,7 +569,8 @@
 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)