projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b946fc
)
Fix for changes to libsub API.
author
Carl Hetherington
<cth@carlh.net>
Wed, 13 Jan 2021 12:26:28 +0000
(13:26 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 13 Jan 2021 12:26:28 +0000
(13:26 +0100)
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index b050fc594a76f97ab72833c38792f62daf4f100d..db2d633697dac6680d0f202b1411f4343bf8a428 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-736,14
+736,14
@@
FFmpegDecoder::decode_ass_subtitle (string ass, ContentTime from)
}
sub::RawSubtitle base;
-
list<sub::RawSubtitle>
raw = sub::SSAReader::parse_line (
+
auto
raw = sub::SSAReader::parse_line (
base,
text,
_ffmpeg_content->video->size().width,
_ffmpeg_content->video->size().height
);
- for (auto const& i: sub::collect<
list<sub::Subtitle>
> (raw)) {
+ for (auto const& i: sub::collect<
vector<sub::Subtitle>
> (raw)) {
only_text()->emit_plain_start (from, i);
}
}