diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-08 23:23:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-08 23:23:07 +0100 |
| commit | f1fab174c7db85a1641bca2830ea75829982723f (patch) | |
| tree | 80f64c7f5daf22f129b5e286487a704c6c069e14 /src/lib/transcoder.cc | |
| parent | 2b4110534a7e3b2a2905c9f25226ba5c1ba4a167 (diff) | |
| parent | 50e6acde52c7eaa3afa239bc14f08eced3787bd9 (diff) | |
Merge branch 'staging'
Diffstat (limited to 'src/lib/transcoder.cc')
| -rw-r--r-- | src/lib/transcoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 48cf402d7..a202d440c 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -73,7 +73,7 @@ Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr< /* Set up the decoder to use the film's set streams */ _decoders.video->set_subtitle_stream (f->subtitle_stream ()); if (f->audio_stream ()) { - _decoders.audio->set_audio_stream (f->audio_stream ()); + _decoders.audio->set_audio_stream (f->audio_stream ()); } _decoders.video->connect_video (_delay_line); |