From 72b11d5eb036651b6ff68edf3ed270e8fc52960f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 12 Oct 2018 00:46:00 +0100
Subject: Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg to
 decode images.  Hence remove {Image,Graphics}Magick.

---
 src/lib/image_decoder.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/image_decoder.cc')

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index fd51c1ba3..e06f6023d 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -22,12 +22,11 @@
 #include "image_decoder.h"
 #include "video_decoder.h"
 #include "image.h"
-#include "magick_image_proxy.h"
+#include "ffmpeg_image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 #include "video_content.h"
-#include <Magick++.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
 
@@ -68,7 +67,7 @@ ImageDecoder::pass ()
 			*/
 			_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
 		} else {
-			_image.reset (new MagickImageProxy (path));
+			_image.reset (new FFmpegImageProxy (path));
 		}
 	}
 
-- 
cgit v1.2.3