projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
873f040
)
Incorporate fade in video content identifiers (#613).
author
Carl Hetherington
<cth@carlh.net>
Thu, 18 Jun 2015 15:33:03 +0000
(16:33 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 18 Jun 2015 15:33:03 +0000
(16:33 +0100)
src/lib/video_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/video_content.cc
b/src/lib/video_content.cc
index a8355ffd67aa0b78ef6c97c5c59d324cbc5c2cc4..60b702e0120ed74598e704422cd9ba0c140fbf29 100644
(file)
--- a/
src/lib/video_content.cc
+++ b/
src/lib/video_content.cc
@@
-332,7
+332,9
@@
VideoContent::identifier () const
<< "_" << crop().right
<< "_" << crop().top
<< "_" << crop().bottom
- << "_" << scale().id();
+ << "_" << scale().id()
+ << "_" << _fade_in
+ << "_" << _fade_out;
if (colour_conversion()) {
s << "_" << colour_conversion().get().identifier ();