summaryrefslogtreecommitdiff
path: root/src/lib/image_examiner.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-27 02:09:22 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-27 02:09:22 +0100
commit387304bc9147933b68eda2b38ba8cac0d250e87e (patch)
tree0697a08182c94193a3424d44d5f7af4231f0ade3 /src/lib/image_examiner.cc
parentfd2b1840496fa121727b7e835843c8beeaebd5eb (diff)
Untested use of Frame for video/audio content lengths.
Diffstat (limited to 'src/lib/image_examiner.cc')
-rw-r--r--src/lib/image_examiner.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 1fd9cd554..502e8adbe 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -68,11 +68,9 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
}
if (content->still ()) {
- _video_length = ContentTime::from_seconds (Config::instance()->default_still_length());
+ _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (24);
} else {
- _video_length = ContentTime::from_frames (
- _image_content->number_of_paths (), video_frame_rate().get_value_or (24)
- );
+ _video_length = _image_content->number_of_paths ();
}
}