Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg

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

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 3a09cb8e8cd0cbce273bea7a66403178d34800a8..e16fab0630af1bece7092f6579c967d15a8315c3 100644 (file)
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -20,7 +20,7 @@
 
 #include "image_proxy.h"
 #include "raw_image_proxy.h"
-#include "magick_image_proxy.h"
+#include "ffmpeg_image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "image.h"
 #include "exceptions.h"
@@ -40,8 +40,8 @@ image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
        if (xml->string_child("Type") == N_("Raw")) {
                return shared_ptr<ImageProxy> (new RawImageProxy (xml, socket));
-       } else if (xml->string_child("Type") == N_("Magick")) {
-               return shared_ptr<MagickImageProxy> (new MagickImageProxy (xml, socket));
+       } else if (xml->string_child("Type") == N_("FFmpeg")) {
+               return shared_ptr<FFmpegImageProxy> (new FFmpegImageProxy(xml, socket));
        } else if (xml->string_child("Type") == N_("J2K")) {
                return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket));
        }