summaryrefslogtreecommitdiff
path: root/src/lib/player_video.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-30 00:05:34 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-04 21:14:06 +0000
commit6c19b21e12f73ce63edd406ea617ff25bcc9bfea (patch)
treea671b7fd9913abef6eda535ed2551328a078cbcc /src/lib/player_video.h
parentb1991796d6a4cbed8f8e1378bedbf7ecbf9647a2 (diff)
Use libdcp's compress_j2k; move Data into libdcp.
Diffstat (limited to 'src/lib/player_video.h')
-rw-r--r--src/lib/player_video.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 2a471584b..01b1c74f5 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -22,7 +22,6 @@
#include "dcpomatic_time.h"
#include "colour_conversion.h"
#include "position_image.h"
-#include "data.h"
extern "C" {
#include <libavutil/pixfmt.h>
}
@@ -61,7 +60,7 @@ public:
void send_binary (boost::shared_ptr<Socket> socket) const;
bool has_j2k () const;
- Data j2k () const;
+ dcp::Data j2k () const;
DCPTime time () const {
return _time;