summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-06-07 09:27:35 +0100
committerCarl Hetherington <cth@carlh.net>2018-06-07 09:27:35 +0100
commit54ca9edc8d6cfc6f7175986d5df21bc101663576 (patch)
tree81b725ba164648d2b8dceda360ea92b53c448bb3 /src/lib
parent0dda484cdbe6edcbf3f80d52168b82bc9d00da7f (diff)
Fix thinko in 5c49ce9.
Diffstat (limited to 'src/lib')
-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 c94e0b549..7ec8acffa 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -561,7 +561,7 @@ Player::pass ()
content (but the decoder does not know it yet);
check for that and fake it here if necessary.
*/
- DCPTime const t = content_time_to_dcp (i, min(i->decoder->position(), i->content->trim_start()));
+ DCPTime const t = content_time_to_dcp (i, max(i->decoder->position(), i->content->trim_start()));
if (t > i->content->end()) {
i->done = true;
} else {