diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-16 14:53:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-16 14:53:22 +0000 |
| commit | aa230169f8b59b7cb2da9a3bbb8ce5f7600285c0 (patch) | |
| tree | 5cde52f6c50b9a56597e0f6ebad1f8e4aa5e1c8d /src/lib/transcoder.cc | |
| parent | 7fd2aff3af82d3e573934d046be26b72a67a93e6 (diff) | |
| parent | 3ce37f08e98b9c3a238fb1c9a6184fb7fd4e5667 (diff) | |
Merge speed-up branch.
Diffstat (limited to 'src/lib/transcoder.cc')
| -rw-r--r-- | src/lib/transcoder.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index f44a3ed7b..87a1fb3f2 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -64,7 +64,9 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, J /* Set up the decoder to use the film's set streams */ _decoders.video->set_subtitle_stream (f->subtitle_stream ()); - _decoders.audio->set_audio_stream (f->audio_stream ()); + if (_decoders.audio) { + _decoders.audio->set_audio_stream (f->audio_stream ()); + } if (_matcher) { _decoders.video->connect_video (_matcher); @@ -73,7 +75,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, J _decoders.video->connect_video (_encoder); } - if (_matcher && _delay_line) { + if (_matcher && _delay_line && _decoders.audio) { _decoders.audio->connect_audio (_delay_line); _delay_line->connect_audio (_matcher); _matcher->connect_audio (_gain); @@ -97,7 +99,7 @@ Transcoder::go () _decoders.video->set_progress (); } - if (!done[1] && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) { + if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) { done[1] = _decoders.audio->pass (); } else { done[1] = true; |