From: Carl Hetherington <cth@carlh.net>
Date: Fri, 19 Jul 2013 00:05:38 +0000 (+0100)
Subject: Hopefully fix some still-image frame rate confusion.
X-Git-Tag: v2.0.48~1337^2~197^2~1
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=979926afff87364dc16bb8e7568991b5120469eb;p=dcpomatic.git

Hopefully fix some still-image frame rate confusion.
---

diff --git a/src/lib/imagemagick_content.cc b/src/lib/imagemagick_content.cc
index ae3e18137..79623b21c 100644
--- a/src/lib/imagemagick_content.cc
+++ b/src/lib/imagemagick_content.cc
@@ -76,7 +76,7 @@ ImageMagickContent::examine (shared_ptr<Job> job)
 	
 	shared_ptr<ImageMagickExaminer> examiner (new ImageMagickExaminer (film, shared_from_this()));
 
-	set_video_length (Config::instance()->default_still_length() * 24);
+	set_video_length (Config::instance()->default_still_length() * video_frame_rate());
 	take_from_video_examiner (examiner);
 }
 
@@ -97,8 +97,8 @@ ImageMagickContent::length () const
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 	
-	FrameRateConversion frc (24, film->dcp_video_frame_rate ());
-	return video_length() * frc.factor() * TIME_HZ / film->dcp_video_frame_rate ();
+	FrameRateConversion frc (video_frame_rate(), film->dcp_video_frame_rate ());
+	return video_length() * frc.factor() * TIME_HZ / video_frame_rate();
 }
 
 string