Cleanup: use default initializers.
authorCarl Hetherington <cth@carlh.net>
Wed, 4 Dec 2024 23:52:43 +0000 (00:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 9 Dec 2024 00:40:29 +0000 (01:40 +0100)
src/lib/ffmpeg_decoder.cc

index 9713a26f69d96f00f9d098073a8d9ba9a17133d6..09d1e2786617dc9be1b8e52fdce60e242447223d 100644 (file)
@@ -671,7 +671,7 @@ FFmpegDecoder::decode_and_process_subtitle_packet (AVPacket* packet)
        if (sub_period.to) {
                _current_subtitle_to = *sub_period.to + _pts_offset;
        } else {
-               _current_subtitle_to = optional<ContentTime>();
+               _current_subtitle_to = {};
        }
 
        ContentBitmapText bitmap_text(from);
@@ -826,12 +826,11 @@ FFmpegDecoder::process_ass_subtitle (string ass, ContentTime from)
                return;
        }
 
-       sub::RawSubtitle base;
        auto video_size = _ffmpeg_content->video->size();
        DCPOMATIC_ASSERT(video_size);
 
        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);
+       auto const raw = sub::SSAReader::parse_line({}, text, context);
 
        for (auto const& i: sub::collect<vector<sub::Subtitle>>(raw)) {
                only_text()->emit_plain_start (from, i);