Do image crop/scale/window in the butler prepare threads.

1 files changed, 14 insertions, 1 deletions

diff --git a/src/lib/butler.h b/src/lib/butler.h
index fb133d108..b1debfca2 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -37,7 +37,16 @@ class Log;
 class Butler : public ExceptionStore, public boost::noncopyable
 {
 public:
-	Butler (boost::shared_ptr<Player> player, boost::shared_ptr<Log> log, AudioMapping map, int audio_channels);
+	Butler (
+		boost::shared_ptr<Player> player,
+		boost::shared_ptr<Log> log,
+		AudioMapping map,
+		int audio_channels,
+		boost::function<AVPixelFormat (AVPixelFormat)> pixel_format,
+		bool aligned,
+		bool fast
+		);
+
 	~Butler ();
 
 	void seek (DCPTime position, bool accurate);
@@ -99,6 +108,10 @@ private:
 
 	bool _disable_audio;
 
+	boost::function<AVPixelFormat (AVPixelFormat)> _pixel_format;
+	bool _aligned;
+	bool _fast;
+
 	/** If we are waiting to be refilled following a seek, this is the time we were
 	    seeking to.
 	*/