From eb0bdad79aa8a8b32e7d23149cf0a0c8f1dfd380 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 8 Mar 2016 12:45:52 +0000
Subject: Various build fixes.

---
 src/lib/jpeg2000_encoder.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/lib/jpeg2000_encoder.h')

diff --git a/src/lib/jpeg2000_encoder.h b/src/lib/jpeg2000_encoder.h
index 0f907e1ba..f77110b54 100644
--- a/src/lib/jpeg2000_encoder.h
+++ b/src/lib/jpeg2000_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 #define DCPOMATIC_JPEG2000_ENCODER_H
 
 #include "types.h"
-#include "data.h"
 #include <dcp/types.h>
+#include <dcp/data.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <list>
@@ -46,7 +46,7 @@ public:
 
 	 *  @return Encoded JPEG2000 data.
 	 */
-	Data encode (
+	dcp::Data encode (
 		boost::shared_ptr<const dcp::OpenJPEGImage> input,
 		int bandwidth,
 		int frame_rate,
@@ -61,7 +61,7 @@ public:
 
 protected:
 
-	virtual Data do_encode (
+	virtual dcp::Data do_encode (
 		boost::shared_ptr<const dcp::OpenJPEGImage> input
 		) = 0;
 
-- 
cgit v1.2.3