Diff of /scanner.c [89c70b] .. [fdcdd9] Maximize Restore

  Switch to side-by-side view

--- a/scanner.c
+++ b/scanner.c
@@ -33,34 +33,8 @@
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #endif
-#if HAVE_FFMPEG_LIBAVUTIL_AVUTIL_H
-#include <ffmpeg/libavutil/avutil.h>
-#elif HAVE_LIBAV_LIBAVUTIL_AVUTIL_H
-#include <libav/libavutil/avutil.h>
-#elif HAVE_LIBAVUTIL_AVUTIL_H
-#include <libavutil/avutil.h>
-#elif HAVE_FFMPEG_AVUTIL_H
-#include <ffmpeg/avutil.h>
-#elif HAVE_LIBAV_AVUTIL_H
-#include <libav/avutil.h>
-#elif HAVE_AVUTIL_H
-#include <avutil.h>
-#endif
-#if HAVE_FFMPEG_LIBAVFORMAT_AVFORMAT_H
-#include <ffmpeg/libavformat/avformat.h>
-#elif HAVE_LIBAV_LIBAVFORMAT_AVFORMAT_H
-#include <libav/libavformat/avformat.h>
-#elif HAVE_LIBAVFORMAT_AVFORMAT_H
-#include <libavformat/avformat.h>
-#elif HAVE_FFMPEG_AVFORMAT_H
-#include <ffmpeg/avformat.h>
-#elif HAVE_LIBAV_LIBAVFORMAT_H
-#include <libav/avformat.h>
-#elif HAVE_AVFORMAT_H
-#include <avformat.h>
-#endif
-
 #include <sqlite3.h>
+#include "libav.h"
 
 #include "scanner_sqlite.h"
 #include "upnpglobalvars.h"