diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-19 22:06:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-19 22:06:52 +0100 |
| commit | ecedb8cd842bf09a4e44f5cc66e227f9e8711cc5 (patch) | |
| tree | 175f86f8500c8038273ac62f25e4b9f5854f8ad4 | |
| parent | 86bca01ddd9674fbf6528a505663b0a3065f46a3 (diff) | |
Fix daft mistake in time fixups causing end trim to be added to length.
| -rw-r--r-- | src/lib/content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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<const Film> 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 |