summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-10 10:02:20 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-10 10:02:20 +0100
commitcb33319a820b17a05cfb2ef78ba1799f4d0c54b9 (patch)
tree7529501950b16db912a527d269ed83e39a37f7d6 /src/lib/decoder_factory.cc
parent3781be4da4601176d7bb954f9cc65621d75e7344 (diff)
parenta097506d4867fec47406283caa5b262a21791585 (diff)
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 6826724af..c03912094 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -42,7 +42,7 @@ decoder_factory (
if (fs->content_type() == STILL) {
/* Always ignore length of decodes of stills, since the decoder finishes very quickly
- and its the encoder that takes the time.
+ and it's the encoder that takes the time.
*/
return shared_ptr<Decoder> (new ImageMagickDecoder (fs, o, j, l, minimal, true));
}