Index: moc-2.5.0-alpha3/configure.in
===================================================================
--- moc-2.5.0-alpha3.orig/configure.in
+++ moc-2.5.0-alpha3/configure.in
@@ -485,6 +485,7 @@ then
 				  DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"],
 				  [true])
 	fi
+	AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
 fi
 
 dnl speex
Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
===================================================================
--- moc-2.5.0-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
+++ moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
@@ -22,7 +22,11 @@
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
+#if HAVE_LIBAVFORMAT_AVFORMAT_H
+#include <libavformat/avformat.h>
+#else
 #include <ffmpeg/avformat.h>
+#endif
 
 /* FFmpeg also likes common names, without that, our common.h and log.h would
  * not be included. */