From 19f94521139aac13ef8fb4eaa55855b2ada307b4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 9 May 2016 19:58:37 +0100 Subject: Move video frame rate ('prepared-for') into Content. --- src/lib/image_decoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/image_decoder.cc') diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index c3a11ce97..6c46b9c08 100644 --- a/src/lib/image_decoder.cc +++ b/src/lib/image_decoder.cc @@ -35,7 +35,7 @@ using boost::shared_ptr; using dcp::Size; ImageDecoder::ImageDecoder (shared_ptr c, shared_ptr log) - : VideoDecoder (c->video, log) + : VideoDecoder (c, log) , _image_content (c) , _video_position (0) { @@ -71,5 +71,5 @@ void ImageDecoder::seek (ContentTime time, bool accurate) { VideoDecoder::seek (time, accurate); - _video_position = time.frames_round (_image_content->video->frame_rate ()); + _video_position = time.frames_round (_image_content->active_video_frame_rate ()); } -- cgit v1.2.3