summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-12-05 00:52:43 +0100
committerCarl Hetherington <cth@carlh.net>2024-12-05 23:37:18 +0100
commit1e9a08adcf5928a5999d01e9ecac885d07f057e1 (patch)
tree2f26bf21f6ccd201e3642de91e173cd7375a763b
parent51ce2d6a90b0827a42f3b42652d13fded2f45b71 (diff)
Cleanup: use default initializers.
-rw-r--r--src/lib/ffmpeg_decoder.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 9713a26f6..09d1e2786 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -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);