From bd8fa9a370f1739952c83107352baa08c79d095e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Oct 2012 18:14:10 +0100 Subject: Merge FilmState / Film. --- src/lib/transcoder.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/lib/transcoder.cc') diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index a809e55d2..8c02b7633 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -18,7 +18,7 @@ */ /** @file src/transcoder.cc - * @brief A class which takes a FilmState and some Options, then uses those to transcode a Film. + * @brief A class which takes a Film and some Options, then uses those to transcode the film. * * A decoder is selected according to the content type, and the encoder can be specified * as a parameter to the constructor. @@ -34,16 +34,15 @@ using namespace std; using namespace boost; /** Construct a transcoder using a Decoder that we create and a supplied Encoder. - * @param s FilmState of Film that we are transcoding. + * @param f Film that we are transcoding. * @param o Options. * @param j Job that we are running under, or 0. - * @param l Log that we can write to. * @param e Encoder to use. */ -Transcoder::Transcoder (shared_ptr s, shared_ptr o, Job* j, Log* l, shared_ptr e) +Transcoder::Transcoder (shared_ptr f, shared_ptr o, Job* j, shared_ptr e) : _job (j) , _encoder (e) - , _decoder (decoder_factory (s, o, j, l)) + , _decoder (decoder_factory (f, o, j)) { assert (_encoder); -- cgit v1.2.3