summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-11-05 10:36:55 +0000
committerCarl Hetherington <cth@carlh.net>2012-11-05 10:36:55 +0000
commitca4d051ceafb77c281583c4e50b391f230544313 (patch)
treef3bb8a080dd87feae70ed90cb93d99e4bdd7e4a2 /src/lib/decoder_factory.cc
parent10a001a0c7cf33d384d9613168d80c0c5a07426c (diff)
Move trimming into the encoder; seems to be cleaner.
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 287bba0da..d4a91d8d9 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -32,17 +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
+ shared_ptr<Film> f, shared_ptr<const Options> o, Job* j
)
{
if (boost::filesystem::is_directory (f->content_path ())) {
/* Assume a directory contains TIFFs */
- return shared_ptr<Decoder> (new TIFFDecoder (f, o, j, minimal));
+ return shared_ptr<Decoder> (new TIFFDecoder (f, o, j));
}
if (f->content_type() == STILL) {
- return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j, minimal));
+ return shared_ptr<Decoder> (new ImageMagickDecoder (f, o, j));
}
- return shared_ptr<Decoder> (new FFmpegDecoder (f, o, j, minimal));
+ return shared_ptr<Decoder> (new FFmpegDecoder (f, o, j));
}