From bd8fa9a370f1739952c83107352baa08c79d095e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 24 Oct 2012 18:14:10 +0100
Subject: Merge FilmState / Film.

---
 src/lib/encoder.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 62ba922da..7352dcfb1 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -28,14 +28,12 @@ using namespace boost;
 
 int const Encoder::_history_size = 25;
 
-/** @param s FilmState of the film that we are encoding.
+/** @param f Film that we are encoding.
  *  @param o Options.
- *  @param l Log.
  */
-Encoder::Encoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
-	: _fs (s)
+Encoder::Encoder (shared_ptr<const Film> f, shared_ptr<const Options> o)
+	: _film (f)
 	, _opt (o)
-	, _log (l)
 	, _just_skipped (false)
 	, _last_frame (0)
 {
-- 
cgit v1.2.3