From 2f56f38ce56b36f20d59593f56981e7ed330c484 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 19 Dec 2012 23:50:17 +0000
Subject: Re-work again so that there's just one encoder; various tweaks to
 still-image-with-audio.

---
 src/lib/imagemagick_decoder.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib/imagemagick_decoder.cc')

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 131eaa500..bad1fb813 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -70,7 +70,12 @@ bool
 ImageMagickDecoder::pass ()
 {
 	if (_iter == _files.end()) {
-		return true;
+		if (!_film->dcp_length() || video_frame() >= _film->dcp_length().get()) {
+			return true;
+		}
+
+		repeat_last_video ();
+		return false;
 	}
 	
 	Magick::Image* magick_image = new Magick::Image (_film->content_path ());
-- 
cgit v1.2.3