X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fencode_server.cc;h=442ce3d6f4b41377c69874bf45a1ec44e2f90a43;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=cf5ec651a99655ba249cb07dccd3c4d019622b59;hpb=422be0eece2bf6ee80db1d3c21553cd82efff789;p=dcpomatic.git

diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index cf5ec651a..442ce3d6f 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -31,11 +31,10 @@
 #include "config.h"
 #include "cross.h"
 #include "player_video.h"
-#include "raw_convert.h"
 #include "compose.hpp"
 #include "log.h"
 #include "encoded_log_entry.h"
-#include <locked_sstream.h>
+#include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
@@ -65,6 +64,7 @@ using boost::scoped_array;
 using boost::optional;
 using dcp::Size;
 using dcp::Data;
+using dcp::raw_convert;
 
 EncodeServer::EncodeServer (shared_ptr<Log> log, bool verbose, int num_threads)
 	: Server (Config::instance()->server_port_base())