projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fecc0c7
)
Clear out _next_time when seeking, so out-of-date values don't
author
Carl Hetherington
<cth@carlh.net>
Wed, 14 Oct 2020 19:23:36 +0000
(21:23 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 14 Oct 2020 19:50:24 +0000
(21:50 +0200)
hang around. Part of the fix for #1857.
Backported-from-commit:
9a3df0a97b7962c00726447a75599e34c632cb2b
Backported-from-branch: v2.15.x
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index bb852d9d849833a074841c149abac0bcc92a53ee..f5af0628e213f031f845d728193c97da55943138 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-399,6
+399,10
@@
FFmpegDecoder::seek (ContentTime time, bool accurate)
}
_have_current_subtitle = false;
+
+ BOOST_FOREACH (optional<ContentTime>& i, _next_time) {
+ i = optional<ContentTime>();
+ }
}
void