From 2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 14 Apr 2016 02:06:18 +0100 Subject: Rename video/audio/subtitle part methods. --- src/lib/image_decoder.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/image_decoder.cc') diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc index e26574f61..c3a11ce97 100644 --- a/src/lib/image_decoder.cc +++ b/src/lib/image_decoder.cc @@ -45,7 +45,7 @@ ImageDecoder::ImageDecoder (shared_ptr c, shared_ptr lo bool ImageDecoder::pass (PassReason, bool) { - if (_video_position >= _image_content->video->video_length()) { + if (_video_position >= _image_content->video->length()) { return true; } @@ -56,7 +56,7 @@ ImageDecoder::pass (PassReason, bool) /* We can't extract image size from a JPEG2000 codestream without decoding it, so pass in the image content's size here. */ - _image.reset (new J2KImageProxy (path, _image_content->video->video_size ())); + _image.reset (new J2KImageProxy (path, _image_content->video->size ())); } else { _image.reset (new MagickImageProxy (path)); } @@ -71,5 +71,5 @@ void ImageDecoder::seek (ContentTime time, bool accurate) { VideoDecoder::seek (time, accurate); - _video_position = time.frames_round (_image_content->video->video_frame_rate ()); + _video_position = time.frames_round (_image_content->video->frame_rate ()); } -- cgit v1.2.3