Stop using static initialisation so that dcpomatic::write() can be called more than...

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

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