diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-05-15 22:37:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-05-21 21:32:05 +0100 |
| commit | d5ece4a49930f905b767855e4310bae74b7fdac8 (patch) | |
| tree | 1bbbcbbf53e578df0246d68d8ed5a7cba967ddd7 /src | |
| parent | ae48994e61b6a3da4a9a258dbdf728ae6efdfe58 (diff) | |
Cherry-pick e881184: fix incorrect subtitle positioning in a VF when there are more than two consecutive reels without subtitles.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/writer.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index deb93b6c1..5f25b23c5 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -657,8 +657,9 @@ Writer::write (PlayerSubtitles subs, DCPTimePeriod period) return; } - if (_subtitle_reel->period().to <= period.from) { + while (_subtitle_reel->period().to <= period.from) { ++_subtitle_reel; + DCPOMATIC_ASSERT (_subtitle_reel != _reels.end()); } _subtitle_reel->write (subs); |