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

[gnunet]

Author: holindho
Date: 2009-12-26 13:08:18 +0100 (Sat, 26 Dec 2009)
New Revision: 9899

Modified:
   Extractor/configure.ac
   Extractor/src/plugins/thumbnailffmpeg_extractor.c
Log:
support for older ffmpeg installations


Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2009-12-26 09:12:19 UTC (rev 9898)
+++ Extractor/configure.ac      2009-12-26 12:08:18 UTC (rev 9899)
@@ -486,6 +486,13 @@
   [     AC_MSG_RESULT(no)
         ffmpeg_enabled=0])
 AM_CONDITIONAL(HAVE_FFMPEG, test x$ffmpeg_enabled != x0)
+if test x$ffmpeg_enabled = x1
+then
+  AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
+  AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
+  AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h)
+  AC_CHECK_HEADERS(libswscale/swscale.h ffmpeg/swscale.h)
+fi
 
 
 LE_INTLINCL=""

Modified: Extractor/src/plugins/thumbnailffmpeg_extractor.c
===================================================================
--- Extractor/src/plugins/thumbnailffmpeg_extractor.c   2009-12-26 09:12:19 UTC 
(rev 9898)
+++ Extractor/src/plugins/thumbnailffmpeg_extractor.c   2009-12-26 12:08:18 UTC 
(rev 9899)
@@ -38,9 +38,26 @@
 
 #include "platform.h"
 #include "extractor.h"
+#if HAVE_LIBAVUTIL_AVUTIL_H
+#include <libavutil/avutil.h>
+#elif HAVE_FFMPEG_AVUTIL_H
+#include <ffmpeg/avutil.h>
+#endif
+#if HAVE_LIBAVFORMAT_AVFORMAT_H
 #include <libavformat/avformat.h>
+#elif HAVE_FFMPEG_AVFORMAT_H
+#include <ffmpeg/avformat.h>
+#endif
+#if HAVE_LIBAVCODEC_AVCODEC_H
 #include <libavcodec/avcodec.h>
+#elif HAVE_FFMPEG_AVCODEC_H
+#include <ffmpeg/avcodec.h>
+#endif
+#if HAVE_LIBSWSCALE_SWSCALE_H
 #include <libswscale/swscale.h>
+#elif HAVE_FFMPEG_SWSCALE_H
+#include <ffmpeg/swscale.h>
+#endif
 
 #include "mime_extractor.c" /* TODO: do this cleaner */