From ca4d051ceafb77c281583c4e50b391f230544313 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 5 Nov 2012 10:36:55 +0000
Subject: Move trimming into the encoder; seems to be cleaner.

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

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

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