diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-10 13:19:09 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-10 13:19:09 +0000 |
| commit | 3d9b5186aa39150e53aef3bab09f4350f85cb885 (patch) | |
| tree | aec2493b2d319f2694ebe7304990c6addb702fc7 /src/lib/transcoder.cc | |
| parent | 5c225839172ce9f0a9be81dabfbbeb3190a9ff20 (diff) | |
More various AudioStream hacks.
Diffstat (limited to 'src/lib/transcoder.cc')
| -rw-r--r-- | src/lib/transcoder.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 66d5606af..ac908768e 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -29,6 +29,7 @@ #include "transcoder.h" #include "encoder.h" #include "decoder_factory.h" +#include "film.h" using std::string; using boost::shared_ptr; @@ -45,6 +46,10 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, , _decoder (decoder_factory (f, o, j)) { assert (_encoder); + + /* Set up the decoder to use the film's set streams */ + _decoder->set_audio_stream (f->audio_stream ()); + _decoder->set_subtitle_stream (f->subtitle_stream ()); _decoder->Video.connect (bind (&Encoder::process_video, e, _1, _2, _3)); _decoder->Audio.connect (bind (&Encoder::process_audio, e, _1, _2)); @@ -56,7 +61,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, void Transcoder::go () { - _encoder->process_begin (_decoder->audio_channel_layout()); + _encoder->process_begin (); try { _decoder->go (); } catch (...) { |