Fix merge.

diff --git a/ChangeLog b/ChangeLog
index 1621d623c5d4d61191863dc27b8e17b7914675fd..1a86e5b00bb6dc258a6579b19488a442c7d37967 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-01-23  Carl Hetherington  <cth@carlh.net>
 
+       * Fix flicker of SubRip subtitles in some cases.
+
        * Version 2.0.37 released.
 
 2015-01-21  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 694b2215725b2a17070256f2f28a3d3b404f905f..552a96b8f325416fe1b2c60ac0470ddb19422276 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -65,8 +65,8 @@ SubRipDecoder::pass ()
                                        j->italic,
                                        dcp::Colour (255, 255, 255),
                                        j->font_size.points (72 * 11),
-                                       dcp::Time (rint (_subtitles[_next].from.all_as_seconds())),
-                                       dcp::Time (rint (_subtitles[_next].to.all_as_seconds())),
+                                       dcp::Time (_subtitles[_next].from.all_as_seconds()),
+                                       dcp::Time (_subtitles[_next].to.all_as_seconds()),
                                        i->vertical_position.line.get() * (1.5 / 22) + 0.8,
                                        dcp::TOP,
                                        j->text,