diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-14 02:06:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d (patch) | |
| tree | 70034dc6789e55394dac0ec87b968c58b96e4b48 /src/lib/image_decoder.cc | |
| parent | 826ed68a1e34ce158342da324ff7203af0449641 (diff) | |
Rename video/audio/subtitle part methods.
Diffstat (limited to 'src/lib/image_decoder.cc')
| -rw-r--r-- | src/lib/image_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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<const ImageContent> c, shared_ptr<Log> 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 ()); } |