Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index acff9c8965832a1af81739bffcd6376c38039e83..c018c92432997fefbca0281df2f6c966464e6b9f 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -54,7 +54,7 @@ Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
        : _film (film)
        , _player (new Player (film, film->playlist ()))
        , _writer (new Writer (film, j))
-       , _encoder (new Encoder (film, j, _writer))
+       , _encoder (new Encoder (film, _writer))
        , _finishing (false)
 {
 
@@ -91,7 +91,7 @@ Transcoder::go ()
                _writer->write (_player->get_audio (t, frame, true));
 
                if (non_burnt_subtitles) {
-                       _writer->write (_player->get_subtitles (t, frame, true, false));
+                       _writer->write (_player->get_subtitles (t, frame, true, false, true));
                }
        }