projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2517ec7
)
Hopefully fix erroneous unresolved asset errors with OV/VF DCPs.
author
Carl Hetherington
<cth@carlh.net>
Wed, 12 Jul 2017 14:55:01 +0000
(15:55 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 12 Jul 2017 14:55:01 +0000
(15:55 +0100)
cscript
patch
|
blob
|
history
src/lib/dcp.cc
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 6fbe957847ccbe1df5fa542684d09aea8566f6b6..9be358723d2bc2661f3f018d1322c42f9165282c 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-295,8
+295,8
@@
def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'd993f38', ffmpeg_options),
- ('libdcp', 'a
1d530b
'),
- ('libsub', '
117c4d9
'),
+ ('libdcp', 'a
6a4c47
'),
+ ('libsub', '
83d90be
'),
('rtaudio-cdist', None))
def configure_options(target):
diff --git
a/src/lib/dcp.cc
b/src/lib/dcp.cc
index f58b06b57f4aab65ed48ac282f59cb4c18d7792c..7e6c66c6c2d4f93e288cae1f41b10d40379c4723 100644
(file)
--- 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
));
}
}
}