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/ab_transcoder.cc | |
| parent | a00ebbc68438e84076c65e99d0e70403afb4407d (diff) | |
Repair very bad merge. Mysterious.
Diffstat (limited to 'src/lib/ab_transcoder.cc')
| -rw-r--r-- | src/lib/ab_transcoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc index 7db13afcc..6eef397c2 100644 --- a/src/lib/ab_transcoder.cc +++ b/src/lib/ab_transcoder.cc @@ -70,8 +70,8 @@ ABTranscoder::ABTranscoder ( _db.video->set_subtitle_stream (_film_a->subtitle_stream ()); _da.audio->set_audio_stream (_film_a->audio_stream ()); - _da.video->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3)); - _db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3)); + _da.video->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3, _4)); + _db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4)); _combiner->connect_video (_delay_line); _delay_line->connect_video (_matcher); |