diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-17 21:30:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-17 21:30:16 +0000 |
| commit | 39c65e47432c76a4e34aaea5317bd7362409aed0 (patch) | |
| tree | 5bacc1d631de0a2b7f0aa492ddaf05a65e06d97c /src/lib/imagemagick_decoder.cc | |
| parent | 3882d34aed9dee417ceed93bf0bf5372b3970ff6 (diff) | |
Try to tidy up frame indexing; use DCP length obtained from the transcode to make the DCP.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index 063730540..bab4f2f07 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -27,6 +27,7 @@ using std::cout; using boost::shared_ptr; +using libdcp::Size; ImageMagickDecoder::ImageMagickDecoder ( boost::shared_ptr<Film> f, DecodeOptions o, Job* j) @@ -70,7 +71,7 @@ bool ImageMagickDecoder::pass () { if (_iter == _files.end()) { - if (!_film->dcp_length() || video_frame() >= _film->dcp_length().get()) { + if (video_frame() >= _film->still_duration_in_frames()) { return true; } |