X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.cc;h=f6f6350d8f53a258caa4814fb5aea2c4a77f6947;hb=8336cba4e6a8c594680696d2337ddc800d84c267;hp=3a09cb8e8cd0cbce273bea7a66403178d34800a8;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index 3a09cb8e8..f6f6350d8 100644
--- 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"
@@ -33,15 +33,15 @@
 
 using std::cout;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 shared_ptr<ImageProxy>
 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));
 	}