#include <dcp/version.h>
#include <libssh/libssh.h>
#ifdef DCPOMATIC_IMAGE_MAGICK
+/* ImageMagick */
+#ifdef DCPOMATIC_MAGICKCORE_MAGICK
#include <magick/MagickCore.h>
+#include <magick/version.h>
+#else
+#include <MagickCore/MagickCore.h>
+#include <MagickCore/version.h>
+#endif
#else
+/* GraphicsMagick */
#include <magick/common.h>
#include <magick/magick_config.h>
-#endif
#include <magick/version.h>
+#endif
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
+#include <libavfilter/avfilter.h>
#include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
#include <libavutil/pixfmt.h>
}
#include <boost/thread.hpp>