diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-15 16:24:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-15 16:24:03 +0100 |
| commit | 3f2365fcf3a1ffc50901eb2e4af246aa4c83e272 (patch) | |
| tree | 289a2fdbea44d1f5d8326601972e259e65aa0d80 /src/lib/transcoder.cc | |
| parent | a00ebbc68438e84076c65e99d0e70403afb4407d (diff) | |
Repair very bad merge. Mysterious.
Diffstat (limited to 'src/lib/transcoder.cc')
| -rw-r--r-- | src/lib/transcoder.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 8046080de..23fb5b788 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -63,18 +63,9 @@ Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr< _decoders.video->set_subtitle_stream (f->subtitle_stream ()); _decoders.audio->set_audio_stream (f->audio_stream ()); -<<<<<<< HEAD _decoders.video->connect_video (_delay_line); _delay_line->connect_video (_matcher); _matcher->connect_video (_encoder); -======= - if (_matcher) { - _decoders.video->connect_video (_matcher); - _matcher->connect_video (_encoder); - } else { - _decoders.video->connect_video (_encoder); - } ->>>>>>> master _decoders.audio->connect_audio (_delay_line); _delay_line->connect_audio (_matcher); |