diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/lib/transcoder.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index c66d091cf..92c2929ac 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -197,7 +197,7 @@ Player::setup_decoders () new FFmpegDecoder ( _film, fc, _video, _audio && _playlist->audio_from() == Playlist::AUDIO_FFMPEG, - _subtitles && _film->with_subtitles(), + _subtitles, _video_sync ) ); diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index 6744e9193..e0e127d33 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -56,6 +56,10 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j) _gain.reset (new Gain (f->log(), f->audio_gain())); } + if (!f->with_subtitles ()) { + _player->disable_subtitles (); + } + if (_matcher) { _player->connect_video (_matcher); _matcher->connect_video (_encoder); |