diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-28 21:52:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-28 21:52:55 +0100 |
| commit | 813a29171c4bbc518632e3636dd8f95d7bac7bd1 (patch) | |
| tree | 1d4314b8e5d3ec2c52293b0682f28060dda1a594 /src/lib | |
| parent | 36415c679621970b3c80fb910d8d0a57a8161682 (diff) | |
Fix occasional flashes with faded subtitles.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/render_subtitles.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc index c99827d10..45c964e05 100644 --- a/src/lib/render_subtitles.cc +++ b/src/lib/render_subtitles.cc @@ -262,6 +262,8 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp: fade_factor = DCPTime(time - fade_in_start).seconds() / DCPTime(fade_in_end - fade_in_start).seconds(); } else if (fade_out_start <= time && time <= fade_out_end && fade_out_start != fade_out_end) { fade_factor = 1 - DCPTime(time - fade_out_start).seconds() / DCPTime(fade_out_end - fade_out_start).seconds(); + } else if (time < fade_in_start || time > fade_out_end) { + fade_factor = 0; } context->scale (xscale, yscale); |