Another attempt to fix build. v2.13.135
authorCarl Hetherington <cth@carlh.net>
Sat, 23 Mar 2019 08:44:58 +0000 (08:44 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 23 Mar 2019 08:44:58 +0000 (08:44 +0000)
src/lib/player.cc

index c09bcd9..6e6cd75 100644 (file)
@@ -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 ()) {