diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-30 00:05:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-04 21:14:06 +0000 |
| commit | 6c19b21e12f73ce63edd406ea617ff25bcc9bfea (patch) | |
| tree | a671b7fd9913abef6eda535ed2551328a078cbcc /src/lib/dcp_video.h | |
| parent | b1991796d6a4cbed8f8e1378bedbf7ecbf9647a2 (diff) | |
Use libdcp's compress_j2k; move Data into libdcp.
Diffstat (limited to 'src/lib/dcp_video.h')
| -rw-r--r-- | src/lib/dcp_video.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h index cb38cd542..995ceb547 100644 --- a/src/lib/dcp_video.h +++ b/src/lib/dcp_video.h @@ -19,9 +19,9 @@ */ #include "types.h" -#include "data.h" #include "server_description.h" #include <libcxml/cxml.h> +#include <dcp/data.h> /** @file src/dcp_video_frame.h * @brief A single frame of video destined for a DCP. @@ -45,8 +45,8 @@ public: DCPVideo (boost::shared_ptr<const PlayerVideo>, int, int, int, Resolution, boost::shared_ptr<Log>); DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>); - Data encode_locally (dcp::NoteHandler note); - Data encode_remotely (ServerDescription); + dcp::Data encode_locally (dcp::NoteHandler note); + dcp::Data encode_remotely (ServerDescription); int index () const { return _index; |