commit 9085ceadbf6fe4993a025564d10a78c9f9c45484 parent f904dfc284eabf72bf87849c4c2ba9f368a8ee13 Author: Heikki Lindholm <holin@iki.fi> Date: Sat, 26 Dec 2009 12:08:18 +0000 support for older ffmpeg installations Diffstat:
| M | configure.ac | | | 7 | +++++++ |
| M | src/plugins/thumbnailffmpeg_extractor.c | | | 17 | +++++++++++++++++ |
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac @@ -486,6 +486,13 @@ AC_ARG_ENABLE(ffmpeg, [ 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="" diff --git a/src/plugins/thumbnailffmpeg_extractor.c b/src/plugins/thumbnailffmpeg_extractor.c @@ -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 */