diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-19 01:05:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-19 01:05:38 +0100 |
| commit | 979926afff87364dc16bb8e7568991b5120469eb (patch) | |
| tree | c3acf8b073cecec8b12789da8fe69498fb810e93 /src/lib | |
| parent | 2918fd61b33f54269e2143f659d320ff555c4e8a (diff) | |
Hopefully fix some still-image frame rate confusion.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/imagemagick_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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 |