projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index f97e324bb4bb5d521467c0fcdd8a837e73299f7b..a1992102c9e55e8e539f3757ba55208153ef86b6 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-397,7
+397,7
@@
FFmpegContent::audio_analysis_path () const
}
list<ContentTimePeriod>
}
list<ContentTimePeriod>
-FFmpegContent::subtitles_during (ContentTimePeriod period) const
+FFmpegContent::subtitles_during (ContentTimePeriod period
, bool starting
) const
{
list<ContentTimePeriod> d;
{
list<ContentTimePeriod> d;
@@
-408,7
+408,7
@@
FFmpegContent::subtitles_during (ContentTimePeriod period) const
/* XXX: inefficient */
for (vector<ContentTimePeriod>::const_iterator i = stream->periods.begin(); i != stream->periods.end(); ++i) {
/* XXX: inefficient */
for (vector<ContentTimePeriod>::const_iterator i = stream->periods.begin(); i != stream->periods.end(); ++i) {
- if (
period.overlaps (*i
)) {
+ if (
(starting && period.contains (i->from)) || (!starting && period.overlaps (*i)
)) {
d.push_back (*i);
}
}
d.push_back (*i);
}
}