Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

[dcpomatic.git] / src / lib / ab_transcoder.cc

diff --git a/src/lib/ab_transcoder.cc b/src/lib/ab_transcoder.cc
index 91c4665a783574736aa48e9e78a8b0264f1539f4..a5659b22f555d9c97734ba808b6f0b79c7bfe479 100644 (file)
--- a/src/lib/ab_transcoder.cc
+++ b/src/lib/ab_transcoder.cc
@@ -48,10 +48,10 @@ ABTranscoder::ABTranscoder (shared_ptr<Film> film_a, shared_ptr<Film> film_b, sh
        , _player_b (film_b->player ())
        , _job (j)
        , _encoder (new Encoder (film_a, j))
-       , _combiner (new Combiner (film_a->log()))
+       , _combiner (new Combiner)
 {
-       _player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3, _4));
-       _player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3, _4));
+       _player_a->Video.connect (bind (&Combiner::process_video, _combiner, _1, _2, _3));
+       _player_b->Video.connect (bind (&Combiner::process_video_b, _combiner, _1, _2, _3));
 
        _combiner->connect_video (_encoder);
        _player_a->connect_audio (_encoder);