diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-23 08:44:58 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-23 08:44:58 +0000 |
| commit | a95e78ea9d4c39f05fc8f7b58141a6a5bdc91ad6 (patch) | |
| tree | 854d1f82008a2bb97755fdcf0129626d5a36ee9d | |
| parent | f0e9267d0839c1eb3e716f6e73a5f1b37d0bad12 (diff) | |
Another attempt to fix build.v2.13.135
| -rw-r--r-- | src/lib/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index c09bcd9fe..6e6cd75d7 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -517,8 +517,8 @@ Player::get_reel_assets () int64_t const reel_duration = k->main_picture()->duration(); /* See doc/design/trim_reels.svg */ - Frame const reel_trim_start = min(reel_duration, max(0LL, trim_start - offset_from_start)); - Frame const reel_trim_end = min(reel_duration, max(0LL, reel_duration - (offset_from_end - trim_end))); + 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))); DCPTime const from = i->position() + DCPTime::from_frames (offset_from_start, _film->video_frame_rate()); if (j->reference_video ()) { |