From 979926afff87364dc16bb8e7568991b5120469eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Jul 2013 01:05:38 +0100 Subject: Hopefully fix some still-image frame rate confusion. --- src/lib/imagemagick_content.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib') 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) shared_ptr 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 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 -- cgit v1.2.3