summaryrefslogtreecommitdiff
path: root/src/lib/ab_transcoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-05 23:10:16 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-05 23:10:16 +0000
commit18614dda0d53b713ace5ad1df57298d049dba87f (patch)
treee68887db77ec57a2de344f8230b0e801030bdca5 /src/lib/ab_transcoder.cc
parent8fa7b8c13a76bd54207156de7bb0d09316bad379 (diff)
Split timed from untimed sinks / sources. Should produce same output, in theory.
Diffstat (limited to 'src/lib/ab_transcoder.cc')
-rw-r--r--src/lib/ab_transcoder.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 4ed5d02ca..373549b57 100644
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -70,14 +70,15 @@ 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));
if (_matcher) {
_combiner->connect_video (_matcher);
_matcher->connect_video (_encoder);
} else {
- _combiner->connect_video (_encoder);
+ /* Remove timestamp from the output of the combiner */
+ _combiner->Video.connect (bind (&Encoder::process_video, _encoder, _1, _2, _3));
}
if (_matcher && _delay_line) {