projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dcp::compose rather than our own.
[dcpomatic.git]
/
src
/
lib
/
dcp_video.cc
diff --git
a/src/lib/dcp_video.cc
b/src/lib/dcp_video.cc
index 4a505a7e18e65996b4666d59f541e67b0f993c06..895e39dd78ed9ce3cd59f87d3749db0afda980da 100644
(file)
--- a/
src/lib/dcp_video.cc
+++ b/
src/lib/dcp_video.cc
@@
-30,7
+30,6
@@
*/
*/
-#include "compose.hpp"
#include "config.h"
#include "cross.h"
#include "dcp_video.h"
#include "config.h"
#include "cross.h"
#include "dcp_video.h"
@@
-44,6
+43,7
@@
#include "rng.h"
#include "warnings.h"
#include <libcxml/cxml.h>
#include "rng.h"
#include "warnings.h"
#include <libcxml/cxml.h>
+#include <dcp/compose.h>
#include <dcp/raw_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/rgb_xyz.h>
#include <dcp/raw_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/rgb_xyz.h>