diff options
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index e80cb92e5..29ab5aaf8 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -89,7 +89,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmp _pts_offset = {}; } - if (c->audio && !c->audio->mapping().mapped_output_channels().empty()) { + if (c->has_mapped_audio()) { audio = make_shared<AudioDecoder>(this, c->audio, fast); } @@ -830,13 +830,8 @@ FFmpegDecoder::process_ass_subtitle (string ass, ContentTime from) auto video_size = _ffmpeg_content->video->size(); DCPOMATIC_ASSERT(video_size); - auto raw = sub::SSAReader::parse_line ( - base, - text, - video_size->width, - video_size->height, - sub::Colour(1, 1, 1) - ); + sub::SSAReader::Context context(video_size->width, video_size->height, sub::Colour(1, 1, 1)); + auto const raw = sub::SSAReader::parse_line(base, text, context); for (auto const& i: sub::collect<vector<sub::Subtitle>>(raw)) { only_text()->emit_plain_start (from, i); |