projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's compress_j2k; move Data into libdcp.
[dcpomatic.git]
/
src
/
lib
/
encoder.cc
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index f48da1d3a1333edcc3999102c6b20a2c530c2747..b03a2ce6aa3b1ac889eab1acea2b80f3415a09f0 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-33,7
+33,6
@@
#include "server_finder.h"
#include "player.h"
#include "player_video.h"
#include "server_finder.h"
#include "player.h"
#include "player_video.h"
-#include "data.h"
#include "server_description.h"
#include "compose.hpp"
#include <libcxml/cxml.h>
#include "server_description.h"
#include "compose.hpp"
#include <libcxml/cxml.h>
@@
-52,6
+51,7
@@
using std::cout;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
+using dcp::Data;
int const Encoder::_history_size = 25;
int const Encoder::_history_size = 25;