From 548e15c115c18937f8c8202ace05dcf0fe6a9374 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 24 Jul 2012 20:50:21 +0100
Subject: Hacky workaround for bad progress reporting during still image
 encodes.

---
 src/lib/decoder_factory.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/lib/decoder_factory.cc')

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));
-- 
cgit v1.2.3