diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 18:14:10 +0100 |
| commit | bd8fa9a370f1739952c83107352baa08c79d095e (patch) | |
| tree | dafa3dae2db5439dc08e770fc4b09febac5f0374 /src/lib/encoder.cc | |
| parent | 44b57d623dec97a3f9955082f0b8a7a8d27b7518 (diff) | |
Merge FilmState / Film.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 8 |
1 files changed, 3 insertions, 5 deletions
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) { |