projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
s/use_template/take_settings_from/g
[dcpomatic.git]
/
src
/
lib
/
video_content.cc
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index 5ca48254cd694f40c4cf57d70d85dad3658360cb..d4e814624de8c949a9cd790de392fa536a4986ba 100644
(file)
--- a/
src/lib/video_content.cc
+++ b/
src/lib/video_content.cc
@@
-529,7
+529,7
@@
VideoContent::set_fade_out (Frame t)
}
void
-VideoContent::
use_template
(shared_ptr<const VideoContent> c)
+VideoContent::
take_settings_from
(shared_ptr<const VideoContent> c)
{
_colour_conversion = c->_colour_conversion;
_frame_type = c->_frame_type;