From 862d7d8a1a852fc6bb6dd13ca5db90f83b676579 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 29 Jul 2014 17:55:28 +0200 Subject: player: fix desync when seeking and switching external tracks If you for example use --audio-file, disable the external track, seek, and enable the external track again, the playback position of the external file was off, and you would get major A/V desync. This was actually supposed to work, but broke at some time ago (probably commit 2b87415f). It didn't work, because it attempted to seek the stream if it was already selected, which was always true due to reselect_demux_streams() being called before that. Fix by putting the initial selection and the seek together. --- player/sub.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'player/sub.c') diff --git a/player/sub.c b/player/sub.c index 2018e6ed7b..2ee928794c 100644 --- a/player/sub.c +++ b/player/sub.c @@ -194,10 +194,7 @@ void reinit_subs(struct MPContext *mpctx, int order) assert(!(mpctx->initialized_flags & init_flag)); - struct sh_stream *sh = init_demux_stream(mpctx, track); - - // No track selected, or lazily added DVD track (will actually be created - // on first sub packet) + struct sh_stream *sh = track ? track->stream : NULL; if (!sh) return; -- cgit v1.2.3