summaryrefslogtreecommitdiff
path: root/src/lib/transcoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-31 16:04:10 +0100
committerCarl Hetherington <cth@carlh.net>2013-03-31 16:04:10 +0100
commita054c067ab2cbf6c5abc5df4caa08ffaac206f0b (patch)
tree1f5b68b3030be1bac9b51fbcbe42d176ad6f60c0 /src/lib/transcoder.cc
parent5920000d247ab3ef7fb9ba29c6ba238b323cf909 (diff)
Content can be added and previewed.
Diffstat (limited to 'src/lib/transcoder.cc')
-rw-r--r--src/lib/transcoder.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 19d067149..070258008 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -32,7 +32,6 @@
#include "film.h"
#include "matcher.h"
#include "delay_line.h"
-#include "options.h"
#include "gain.h"
#include "video_decoder.h"
#include "audio_decoder.h"
@@ -44,11 +43,10 @@ using boost::dynamic_pointer_cast;
/** Construct a transcoder using a Decoder that we create and a supplied Encoder.
* @param f Film that we are transcoding.
- * @param o Decode options.
* @param j Job that we are running under, or 0.
* @param e Encoder to use.
*/
-Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job> j)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
: _job (j)
, _playlist (f->playlist ())
, _encoder (new Encoder (f, _playlist))