From 3ffd0163026be24e5373e0674c3301ed37546e44 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Feb 2024 10:47:38 +0100 Subject: Make DCPExaminer::size() optional and deal with the consequences. This means we can fix the case of a VF having no known size in a nice way, in turn fixing problems caused by the fix to #2775. --- src/lib/ffmpeg_decoder.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 0d43156c0..7f7a07863 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -828,11 +828,14 @@ FFmpegDecoder::process_ass_subtitle (string ass, ContentTime from) } sub::RawSubtitle base; + auto video_size = _ffmpeg_content->video->size(); + DCPOMATIC_ASSERT(video_size); + auto raw = sub::SSAReader::parse_line ( base, text, - _ffmpeg_content->video->size().width, - _ffmpeg_content->video->size().height, + video_size->width, + video_size->height, sub::Colour(1, 1, 1) ); -- cgit v1.2.3