summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-20 20:41:20 +0200
committerwm4 <wm4@nowhere>2014-07-20 20:41:20 +0200
commite982b5b287d1a178bea444c6d0f81a877db2d0c9 (patch)
tree2623633d33ef54ee8f371a7310419882c3cb8711 /player
parent5526603a4325efe672485a94d9a3cd2f8b8e7b9e (diff)
downloadmpv-e982b5b287d1a178bea444c6d0f81a877db2d0c9.tar.bz2
mpv-e982b5b287d1a178bea444c6d0f81a877db2d0c9.tar.xz
player: readd code accidentally removed with commit 61efe87e
Oops.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index ffdb23f554..0a855e5cd9 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -343,6 +343,11 @@ bool timeline_set_part(struct MPContext *mpctx, int i, bool force)
uninit_player(mpctx, INITIALIZED_VCODEC | (mpctx->opts->fixed_vo ? 0 : INITIALIZED_VO) | (mpctx->opts->gapless_audio ? 0 : INITIALIZED_AO) | INITIALIZED_ACODEC | INITIALIZED_SUB | INITIALIZED_SUB2);
mpctx->stop_play = orig_stop_play;
+ if (mpctx->demuxer) {
+ demux_stop_thread(mpctx->demuxer);
+ demux_flush(mpctx->demuxer);
+ }
+
mpctx->demuxer = n->source;
mpctx->stream = mpctx->demuxer->stream;