projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e590331
)
The appearance of FFmpegContent can be changed by altering subtitle scale/offset...
author
Carl Hetherington
<cth@carlh.net>
Fri, 26 Jun 2015 18:32:32 +0000
(19:32 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 26 Jun 2015 18:32:32 +0000
(19:32 +0100)
src/lib/ffmpeg_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index ba0b4cc52c7348de052a5df9917018af99ad4098..9d3a79e81e5e40f434cdb6a9fbd08955caccb0df 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-292,7
+292,8
@@
FFmpegContent::identifier () const
{
SafeStringStream s;
- s << VideoContent::identifier();
+ s << VideoContent::identifier() << "_"
+ << SubtitleContent::identifier();
boost::mutex::scoped_lock lm (_mutex);