diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-11-02 14:55:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-11-03 11:29:02 +0100 |
| commit | 244ddf0fc0b6466618408fec7b926f517be067c1 (patch) | |
| tree | 6e03ecee6cea6f6e7d3c26fd4c4f44438052a20a /src/lib | |
| parent | a137f576581448ca68eb5487b0e40ba476367954 (diff) | |
Fix errors when referencing trimmed DCPs (#2116).
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 df10ec146..5404dfac4 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -596,7 +596,7 @@ Player::get_reel_assets () Frame const reel_trim_start = min(reel_duration, max(int64_t(0), trim_start - offset_from_start)); Frame const reel_trim_end = min(reel_duration, max(int64_t(0), reel_duration - (offset_from_end - trim_end))); - auto const from = content->position() + DCPTime::from_frames(offset_from_start, ffr); + auto const from = max(DCPTime(), content->position() + DCPTime::from_frames(offset_from_start, ffr) - DCPTime::from_frames(trim_start, cfr)); if (dcp->reference_video()) { maybe_add_asset (reel_assets, reel->main_picture(), reel_trim_start, reel_trim_end, from, ffr); } |