projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
36f69f2
)
Hacky workaround for bad progress reporting during still image encodes.
author
Carl Hetherington
<cth@carlh.net>
Tue, 24 Jul 2012 19:50:21 +0000
(20:50 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 24 Jul 2012 19:50:21 +0000
(20:50 +0100)
src/lib/decoder_factory.cc
patch
|
blob
|
history
diff --git
a/src/lib/decoder_factory.cc
b/src/lib/decoder_factory.cc
index 5f8fc55b3b20736bf00cb506fe80984cbd3601db..6826724af9eb335ac599f13b4d6098b9d7dbcdcc 100644
(file)
--- 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));