X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=26beeb36399c3efd2b61c662ece72154838a67a5;hp=71f0ca41cab90db1d585c5fd2acf08218379e6d2;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hpb=c4ac1ba47652884a647103ec49b2de4c0b6e60a9

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 71f0ca41c..26beeb363 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -26,12 +26,11 @@
 #include "config.h"
 #include "cross.h"
 #include "compose.hpp"
-#include "magick_image_proxy.h"
+#include "ffmpeg_image_proxy.h"
 #include "image.h"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
 #include <dcp/j2k.h>
-#include <Magick++.h>
 #include <iostream>
 
 #include "i18n.h"
@@ -46,9 +45,6 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	: _film (film)
 	, _image_content (content)
 {
-#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
-	using namespace MagickCore;
-#endif
 	boost::filesystem::path path = content->path(0).string ();
 	if (valid_j2k_file (path)) {
 		boost::uintmax_t size = boost::filesystem::file_size (path);
@@ -67,7 +63,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 		}
 		delete[] buffer;
 	} else {
-		MagickImageProxy proxy(content->path(0));
+		FFmpegImageProxy proxy(content->path(0));
 		_video_size = proxy.image().first->size();
 	}