summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 06377e26c..287bba0da 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -32,20 +32,17 @@ using boost::shared_ptr;
shared_ptr<Decoder>
decoder_factory (
- shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal = false, bool ignore_length = false
+ shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, bool minimal = false
)
{
if (boost::filesystem::is_directory (f->content_path ())) {
/* Assume a directory contains TIFFs */
- return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal, ignore_length));
+ return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal));
}
if (f->content_type() == STILL) {
- /* Always ignore length of decodes of stills, since the decoder finishes very quickly
- and it's the encoder that takes the time.
- */
- return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j, minimal, true));
+ return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j, minimal));
}
- return shared_ptr<Decoder> (new FFmpegDecoder (f, o, j, minimal, ignore_length));
+ return shared_ptr<Decoder> (new FFmpegDecoder (f, o, j, minimal));
}