From: Carl Hetherington Date: Sun, 29 Dec 2013 21:35:24 +0000 (+0000) Subject: Another attempt to fix clang build. X-Git-Tag: v2.0.48~922^2~17 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=b2a9271256e09fcfedff3beea5fc73c04e7c0e14 Another attempt to fix clang build. --- diff --git a/src/lib/player.cc b/src/lib/player.cc index 24c5f2aad..96d23a82b 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -131,7 +131,7 @@ Player::pass () } if (earliest_audio != TIME_MAX) { - TimedAudioBuffers tb = _audio_merger.pull (max (0L, earliest_audio)); + TimedAudioBuffers tb = _audio_merger.pull (max (int64_t (0), earliest_audio)); Audio (tb.audio, tb.time); /* This assumes that the audio_frames_to_time conversion is exact so that there are no accumulated errors caused by rounding.