Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

[dcpomatic.git] / src / lib / image_decoder.cc

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index fd51c1ba3963888ec891fc44e19349407a29c507..e06f6023d54a8d35b1203f81eef72e823ab9ed0d 100644 (file)
--- 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));
                }
        }