[GNUnet-SVN] r31644 - in Extractor: . src/plugins

[gnunet]

Author: bratao
Date: 2013-12-21 04:19:22 +0100 (Sat, 21 Dec 2013)
New Revision: 31644

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/Makefile.am
Log:
Do not depend on older ffmpeg

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2013-12-21 03:11:12 UTC (rev 31643)
+++ Extractor/configure.ac      2013-12-21 03:19:22 UTC (rev 31644)
@@ -672,7 +672,7 @@
 then
   ffmpeg_enabled=0
   new_ffmpeg=0
-  AC_CHECK_HEADERS([libavutil/frame.h],
+  AC_CHECK_HEADERS([libavutil/avutil.h libavformat/avformat.h 
libavcodec/avcodec.h libavutil/frame.h],
   AC_CHECK_HEADERS([libavresample/avresample.h],new_ffmpeg=1))
   
   AC_CHECK_LIB(swscale, sws_getContext,

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2013-12-21 03:11:12 UTC (rev 31643)
+++ Extractor/src/plugins/Makefile.am   2013-12-21 03:19:22 UTC (rev 31644)
@@ -70,15 +70,13 @@
 # FFmpeg-thumbnailer requires MAGIC and FFMPEG
 PLUGIN_FFMPEG=libextractor_thumbnailffmpeg.la
 TEST_FFMPEG=test_thumbnailffmpeg
+endif
 
-
 if HAVE_FFMPEG_NEW
 PLUGIN_PREVIEWOPUS=libextractor_previewopus.la
 TEST_PREVIEWOPUS=test_previewopus
 endif
 
-endif
-
 if HAVE_GTK
 # Gtk-thumbnailer requires MAGIC and GTK
 PLUGIN_GTK=libextractor_thumbnailgtk.la