From 2671c61a532790ad06c03775b103682233426570 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 9 Mar 2020 21:41:36 +0100 Subject: [PATCH] Enforce a minimum DCP length of 1 second. --- src/lib/film.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 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 -- 2.30.2