summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-07-24 20:50:21 +0100
committerCarl Hetherington <cth@carlh.net>2012-07-24 20:50:21 +0100
commit548e15c115c18937f8c8202ace05dcf0fe6a9374 (patch)
tree0ea710de475f692a5886ede3056e8e13fb31ad23 /src/lib/decoder_factory.cc
parent36f69f2c3542f9a084627860a70e7bf4664263b7 (diff)
Hacky workaround for bad progress reporting during still image encodes.
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 5f8fc55b3..6826724af 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -41,7 +41,10 @@ decoder_factory (
}
if (fs->content_type() == STILL) {
- return shared_ptr<Decoder> (new ImageMagickDecoder (fs, o, j, l, minimal, ignore_length));
+ /* Always ignore length of decodes of stills, since the decoder finishes very quickly
+ and its the encoder that takes the time.
+ */
+ return shared_ptr<Decoder> (new ImageMagickDecoder (fs, o, j, l, minimal, true));
}
return shared_ptr<Decoder> (new FFmpegDecoder (fs, o, j, l, minimal, ignore_length));