summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-10-14 21:23:36 +0200
committerCarl Hetherington <cth@carlh.net>2020-10-14 21:50:24 +0200
commit46064e5c8ae074b1328f8dab541322b6fb091275 (patch)
treeed2889243844c6bf02a7b6c213b04f150a046430
parentfecc0c792748e2b16e8fad33186db79ce6850cc9 (diff)
Clear out _next_time when seeking, so out-of-date values don't
hang around. Part of the fix for #1857. Backported-from-commit: 9a3df0a97b7962c00726447a75599e34c632cb2b Backported-from-branch: v2.15.x
-rw-r--r--src/lib/ffmpeg_decoder.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index bb852d9d8..f5af0628e 100644
--- 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