summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-07-12 15:55:01 +0100
committerCarl Hetherington <cth@carlh.net>2017-07-12 15:55:01 +0100
commitbd2fe66dca73364485471725b8b5bc65b9b835cd (patch)
tree79ff979db89811e126521f1b1d5686f5081ef773
parent2517ec798da291dedc02dd7a7a432f7aa63133e4 (diff)
Hopefully fix erroneous unresolved asset errors with OV/VF DCPs.
-rw-r--r--cscript4
-rw-r--r--src/lib/dcp.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/cscript b/cscript
index 6fbe95784..9be358723 100644
--- a/cscript
+++ b/cscript
@@ -295,8 +295,8 @@ def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'd993f38', ffmpeg_options),
- ('libdcp', 'a1d530b'),
- ('libsub', '117c4d9'),
+ ('libdcp', 'a6a4c47'),
+ ('libsub', '83d90be'),
('rtaudio-cdist', None))
def configure_options(target):
diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index f58b06b57..7e6c66c6c 100644
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -47,7 +47,7 @@ DCP::cpls () const
BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
BOOST_FOREACH (shared_ptr<dcp::DCP> j, dcps) {
if (i != j) {
- i->resolve_refs (j->assets ());
+ i->resolve_refs (j->assets (true));
}
}
}