diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
| commit | 4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad (patch) | |
| tree | 06db8731e77dfeaf537f2814d73c7a599035b95c /src/lib/content.cc | |
| parent | 8102046b2f29e0c7b234c29bf204b056cb30e64f (diff) | |
| parent | 66162217d93baa3fd50594bb013a44bbd779d02a (diff) | |
Merge master.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index b6678cb4d..bbbe9b6ce 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -40,6 +40,7 @@ using std::set; using std::list; using std::cout; using std::vector; +using std::max; using boost::shared_ptr; using dcp::raw_convert; @@ -215,7 +216,7 @@ Content::technical_summary () const DCPTime Content::length_after_trim () const { - return full_length() - trim_start() - trim_end(); + return max (DCPTime (), full_length() - trim_start() - trim_end()); } /** @return string which includes everything about how this content affects |