diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-21 02:14:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-21 02:14:48 +0000 |
| commit | a28253ce511913781db472958fb10259f0d215ad (patch) | |
| tree | 43970a5f08551a9144d1060c62cf7449fda3b42b /src/lib/subrip_decoder.cc | |
| parent | 2c2aa91347c0016e6393fc138afe68adab3d6d21 (diff) | |
| parent | 18bb7f1b92b3f63160cfd1ff75faa5458fbd7df3 (diff) | |
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/subrip_decoder.cc')
| -rw-r--r-- | src/lib/subrip_decoder.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc index ea8997e31..7ec8a1d39 100644 --- a/src/lib/subrip_decoder.cc +++ b/src/lib/subrip_decoder.cc @@ -63,8 +63,7 @@ SubRipDecoder::pass () SubRipContent::font_id, j->italic, dcp::Color (255, 255, 255), - /* .srt files don't specify size, so this is an arbitrary value */ - 48, + j->font_size, dcp::Time (rint (_subtitles[_next].from.metric().get().all_as_milliseconds() / 4)), dcp::Time (rint (_subtitles[_next].to.metric().get().all_as_milliseconds() / 4)), i->vertical_position.line.get() * (1.5 / 22) + 0.8, |