diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-04-10 23:40:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-04-11 01:33:14 +0100 |
| commit | c07b9340d12e6b724719ad6fd885102ab1a6d84e (patch) | |
| tree | f06032b05288eb86f5d3471af11a578c2144474d | |
| parent | ca813d739545b5b8fd7cbd7547f2cb197c222b82 (diff) | |
Missing setup of SubtitleDecoder position causing #1271 and probably other things.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2018-04-10 Carl Hetherington <cth@carlh.net> + + * Fix disappearing subtitles when they are added from text files + alongside video content which also contain subtitles (#1271). + 2018-04-05 Carl Hetherington <cth@carlh.net> * Fix crash on startup if there are no audio devices (#1265). diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 39c36415a..32cae6acc 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -61,6 +61,7 @@ void SubtitleDecoder::emit_image_start (ContentTime from, shared_ptr<Image> image, dcpomatic::Rect<double> rect) { ImageStart (ContentImageSubtitle (from, image, rect)); + _position = from; } void |