From: Carl Hetherington <cth@carlh.net>
Date: Mon, 9 Mar 2020 20:41:36 +0000 (+0100)
Subject: Enforce a minimum DCP length of 1 second.
X-Git-Tag: v2.15.48~14
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=2671c61a532790ad06c03775b103682233426570;hp=ec06bc09c3ee7e69fb99056d8b665b733021e6a7;p=dcpomatic.git

Enforce a minimum DCP length of 1 second.
---

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5556c8e68..5531a198c 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1254,11 +1254,13 @@ Film::move_content_later (shared_ptr<Content> c)
 	_playlist->move_later (shared_from_this(), c);
 }
 
-/** @return length of the film from time 0 to the last thing on the playlist */
+/** @return length of the film from time 0 to the last thing on the playlist,
+ *  with a minimum length of 1 second.
+ */
 DCPTime
 Film::length () const
 {
-	return _playlist->length(shared_from_this()).ceil(video_frame_rate());
+	return max(DCPTime::from_seconds(1), _playlist->length(shared_from_this()).ceil(video_frame_rate()));
 }
 
 int