X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.cc;h=50d33e9d5e1cff769336d1ba7332e0f7363095fc;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hp=3a85a5ac6acf553eb7adc8dadc66d8530671d216;hpb=67ff55886b1ee86d99c2ea27d10c73b85b0504b7;p=dcpomatic.git

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 3a85a5ac6..50d33e9d5 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -42,15 +42,15 @@
 #include "log.h"
 #include "player_video.h"
 #include "rng.h"
-#include "warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/j2k_transcode.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <stdint.h>
@@ -125,7 +125,7 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
  *  @return Encoded data.
  */
 ArrayData
-DCPVideo::encode_locally ()
+DCPVideo::encode_locally () const
 {
 	auto const comment = Config::instance()->dcp_j2k_comment();
 
@@ -204,7 +204,7 @@ DCPVideo::encode_locally ()
  *  @return Encoded data.
  */
 ArrayData
-DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
+DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout) const
 {
 	boost::asio::io_service io_service;
 	boost::asio::ip::tcp::resolver resolver (io_service);