diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-03-06 00:51:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-03-06 00:51:44 +0000 |
| commit | 422341d1cb6bc8cbb6be76eac239c40cb4061c79 (patch) | |
| tree | 1a4193e699024bd53f5ef2da5d9958aa74ffbd06 /src/lib/ab_transcoder.cc | |
| parent | 18614dda0d53b713ace5ad1df57298d049dba87f (diff) | |
Revert "Split timed from untimed sinks / sources. Should produce same output, in theory."
This reverts commit 18614dda0d53b713ace5ad1df57298d049dba87f.
Diffstat (limited to 'src/lib/ab_transcoder.cc')
| -rw-r--r-- | src/lib/ab_transcoder.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc index 373549b57..4ed5d02ca 100644 --- a/src/lib/ab_transcoder.cc +++ b/src/lib/ab_transcoder.cc @@ -70,15 +70,14 @@ 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, _4)); - _db.video->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4)); + _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)); if (_matcher) { _combiner->connect_video (_matcher); _matcher->connect_video (_encoder); } else { - /* Remove timestamp from the output of the combiner */ - _combiner->Video.connect (bind (&Encoder::process_video, _encoder, _1, _2, _3)); + _combiner->connect_video (_encoder); } if (_matcher && _delay_line) { |