diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-06-07 16:33:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-06-07 16:33:45 +0100 |
| commit | 72f62ee25c0262571b7dfc2104b644099f2d4720 (patch) | |
| tree | 1dcddc3ce5985f52e0be05caa0c97bb3aadd09d9 /src/lib | |
| parent | a8bfc5acbb3944ed0653f293284cec7d8af42931 (diff) | |
Fix for wrong reel-sizes under trim; like 54ca9edc8d6cfc6f7175986d5df21bc101663576 from v2.12.x.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index c7d7b2f44..5515b70e8 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -546,7 +546,7 @@ Player::pass () continue; } - DCPTime const t = content_time_to_dcp (i, i->decoder->position()); + DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start())); if (t > i->content->end()) { i->done = true; } else { |