From 72f62ee25c0262571b7dfc2104b644099f2d4720 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 7 Jun 2018 16:33:45 +0100
Subject: Fix for wrong reel-sizes under trim; like
 54ca9edc8d6cfc6f7175986d5df21bc101663576 from v2.12.x.

---
 src/lib/player.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c7d7b2f44..5515b70e8 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -546,7 +546,7 @@ Player::pass ()
 			continue;
 		}
 
-		DCPTime const t = content_time_to_dcp (i, i->decoder->position());
+		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 {
-- 
cgit v1.2.3