diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-18 21:13:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-18 21:13:53 +0000 |
| commit | 602fd58eff38fdfccc489b9f77b3ff0ca0009566 (patch) | |
| tree | f44645730c3b412fcc0c79f4bca73260567a362d /src/lib/imagemagick_decoder.cc | |
| parent | 039a55081427b1ff0026cd6b9ca787526d37ef92 (diff) | |
| parent | 0330d9b2924767d9240c5a25e9ed4327eb0a73bd (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index 5713e68f9..131eaa500 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -108,8 +108,22 @@ ImageMagickDecoder::pixel_format () const } bool -ImageMagickDecoder::seek (SourceFrame f) +ImageMagickDecoder::seek_to_last () { + if (_iter == _files.end()) { + _iter = _files.begin(); + } else { + --_iter; + } + + return false; +} + +bool +ImageMagickDecoder::seek (double t) +{ + int const f = t * frames_per_second(); + _iter = _files.begin (); for (int i = 0; i < f; ++i) { if (_iter == _files.end()) { |