From 39c65e47432c76a4e34aaea5317bd7362409aed0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jan 2013 21:30:16 +0000
Subject: Try to tidy up frame indexing; use DCP length obtained from the
 transcode to make the DCP.

---
 src/lib/imagemagick_decoder.cc | 3 ++-
 1 file changed, 2 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 063730540..bab4f2f07 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -27,6 +27,7 @@
 
 using std::cout;
 using boost::shared_ptr;
+using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (
 	boost::shared_ptr<Film> f, DecodeOptions o, Job* j)
@@ -70,7 +71,7 @@ bool
 ImageMagickDecoder::pass ()
 {
 	if (_iter == _files.end()) {
-		if (!_film->dcp_length() || video_frame() >= _film->dcp_length().get()) {
+		if (video_frame() >= _film->still_duration_in_frames()) {
 			return true;
 		}
 
-- 
cgit v1.2.3