summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-12-29 21:35:24 +0000
committerCarl Hetherington <cth@carlh.net>2013-12-29 21:35:24 +0000
commitb2a9271256e09fcfedff3beea5fc73c04e7c0e14 (patch)
treeb4c671d05f6b716b5385b9b836ab1473a8deac1e /src
parent08fa1eec00b25cb34100f920fd0ebbbb11df96e4 (diff)
Another attempt to fix clang build.
Diffstat (limited to 'src')
-rw-r--r--src/lib/player.cc2
1 files changed, 1 insertions, 1 deletions
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<DCPTime> tb = _audio_merger.pull (max (0L, earliest_audio));
+ TimedAudioBuffers<DCPTime> 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.