X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.cc;h=e16fab0630af1bece7092f6579c967d15a8315c3;hb=5731c1539b179524d511406c36260c81cba72b55;hp=69c296605cd8fb6dfa7c8afd995b9dc72097445f;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 69c296605..e16fab063 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -20,14 +20,13 @@
 
 #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"
 #include "cross.h"
 #include <dcp/util.h>
 #include <libcxml/cxml.h>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -35,17 +34,16 @@
 using std::cout;
 using std::string;
 using boost::shared_ptr;
-using boost::make_shared;
 
 shared_ptr<ImageProxy>
 image_proxy_factory (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
 	if (xml->string_child("Type") == N_("Raw")) {
-		return make_shared<RawImageProxy> (xml, socket);
-	} else if (xml->string_child("Type") == N_("Magick")) {
-		return make_shared<MagickImageProxy> (xml, socket);
+		return shared_ptr<ImageProxy> (new RawImageProxy (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 make_shared<J2KImageProxy> (xml, socket);
+		return shared_ptr<J2KImageProxy> (new J2KImageProxy (xml, socket));
 	}
 
 	throw NetworkError (_("Unexpected image type received by server"));