diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
| commit | 58bf77268a8e82e73d7f17ab2fe6dcd29370ade3 (patch) | |
| tree | 0ad0542a74a029920afac6f2eb74f05770d9d4b0 /src/lib/transcode_job.cc | |
| parent | 7829cea9160cd562ed3da5ca1a0060de29edacf8 (diff) | |
| parent | 7faadda40c0ab027b992789329a558fbaf3ec0cc (diff) | |
Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player
Diffstat (limited to 'src/lib/transcode_job.cc')
| -rw-r--r-- | src/lib/transcode_job.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 477c73c75..dfb9b1071 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -24,12 +24,11 @@ #include <iostream> #include <iomanip> #include "transcode_job.h" -#include "j2k_wav_encoder.h" #include "film.h" #include "format.h" #include "transcoder.h" #include "log.h" -#include "encoder_factory.h" +#include "encoder.h" using std::string; using std::stringstream; @@ -63,7 +62,7 @@ TranscodeJob::run () _film->log()->log ("Transcode job starting"); _film->log()->log (String::compose ("Audio delay is %1ms", _film->audio_delay())); - _encoder = encoder_factory (_film, _encode_opt); + _encoder.reset (new Encoder (_film, _encode_opt)); Transcoder w (_film, _decode_opt, this, _encoder); w.go (); set_progress (1); |