X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_proxy.cc;h=c426e796fba8d05819ac9d9133f03415dadba4db;hb=62c03e3d3493df8a31361b3281c443cac35decb0;hp=d81a3ffef0f824600c5b6eecb59710040e72d285;hpb=5d9ff746138a30c1469b788afe5a4eee25fed368;p=dcpomatic.git

diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc
index d81a3ffef..c426e796f 100644
--- a/src/lib/image_proxy.cc
+++ b/src/lib/image_proxy.cc
@@ -19,13 +19,13 @@
 */
 
 
-#include "image_proxy.h"
-#include "raw_image_proxy.h"
+#include "cross.h"
+#include "exceptions.h"
 #include "ffmpeg_image_proxy.h"
-#include "j2k_image_proxy.h"
 #include "image.h"
-#include "exceptions.h"
-#include "cross.h"
+#include "image_proxy.h"
+#include "j2k_image_proxy.h"
+#include "raw_image_proxy.h"
 #include <dcp/util.h>
 #include <libcxml/cxml.h>
 #include <iostream>
@@ -45,7 +45,7 @@ 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_("FFmpeg")) {
-		return shared_ptr<FFmpegImageProxy> (new FFmpegImageProxy(xml, socket));
+		return make_shared<FFmpegImageProxy>(socket);
 	} else if (xml->string_child("Type") == N_("J2K")) {
 		return make_shared<J2KImageProxy>(xml, socket);
 	}