projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e8d6f0
)
Fix overlapping SSA subs.
author
Carl Hetherington
<cth@carlh.net>
Mon, 15 Feb 2016 23:16:35 +0000
(23:16 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 15 Feb 2016 23:16:35 +0000
(23:16 +0000)
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index a1d90b2ba99af04368b056bd84cede08a9790099..294c0da8c22d0b0e7bcb8ad682645247efa4be30 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-553,7
+553,8
@@
FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
boost::optional<string> (),
k.italic,
dcp::Colour (255, 255, 255),
- 60,
+ /* 48pt is 1/22nd of the screen height */
+ 48,
1,
dcp::Time (i.from.seconds(), 1000),
dcp::Time (i.to.seconds(), 1000),