Do not depend on older ffmpeg

2 files changed, 2 insertions, 4 deletions

diff --git a/configure.ac b/configure.ac
index e5a880e..1b168c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -672,7 +672,7 @@ if test x$ffmpeg_enabled = x1
 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,
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 75f8953..97c3575 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -70,15 +70,13 @@ if HAVE_FFMPEG
 # 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