From ecedb8cd842bf09a4e44f5cc66e227f9e8711cc5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Jul 2015 22:06:52 +0100 Subject: Fix daft mistake in time fixups causing end trim to be added to length. --- src/lib/content.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/content.cc b/src/lib/content.cc index 65c005157..f0d35186a 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -223,7 +223,7 @@ Content::length_after_trim () const { shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - return max (DCPTime (), full_length() - DCPTime (trim_start() - trim_end(), film->active_frame_rate_change (position ()))); + return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film->active_frame_rate_change (position ()))); } /** @return string which includes everything about how this content affects -- cgit v1.2.3