diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-09 19:58:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 19f94521139aac13ef8fb4eaa55855b2ada307b4 (patch) | |
| tree | 6e4b457c1fa46c674433fb1a5d2a9cd0f07c5a11 /src/lib/image_decoder.cc | |
| parent | 0a2d40420813403a96352c6dc895d23fcd9994c0 (diff) | |
Move video frame rate ('prepared-for') into Content.
Diffstat (limited to 'src/lib/image_decoder.cc')
| -rw-r--r-- | src/lib/image_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<const ImageContent> c, shared_ptr<Log> 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 ()); } |