diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
| commit | 58bf77268a8e82e73d7f17ab2fe6dcd29370ade3 (patch) | |
| tree | 0ad0542a74a029920afac6f2eb74f05770d9d4b0 /src/lib/imagemagick_decoder.cc | |
| parent | 7829cea9160cd562ed3da5ca1a0060de29edacf8 (diff) | |
| parent | 7faadda40c0ab027b992789329a558fbaf3ec0cc (diff) | |
Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
| -rw-r--r-- | src/lib/imagemagick_decoder.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc index 131eaa500..bad1fb813 100644 --- a/src/lib/imagemagick_decoder.cc +++ b/src/lib/imagemagick_decoder.cc @@ -70,7 +70,12 @@ bool ImageMagickDecoder::pass () { if (_iter == _files.end()) { - return true; + if (!_film->dcp_length() || video_frame() >= _film->dcp_length().get()) { + return true; + } + + repeat_last_video (); + return false; } Magick::Image* magick_image = new Magick::Image (_film->content_path ()); |