diff options
| author | wm4 <wm4@nowhere> | 2014-07-29 17:55:28 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-29 17:55:28 +0200 |
| commit | 862d7d8a1a852fc6bb6dd13ca5db90f83b676579 (patch) | |
| tree | 1872938f935623b207cc9fd03ac3fa2e33176d41 /player/sub.c | |
| parent | 6d15c491b063736d6915e74a9134d1cabde9a663 (diff) | |
| download | mpv-862d7d8a1a852fc6bb6dd13ca5db90f83b676579.tar.bz2 mpv-862d7d8a1a852fc6bb6dd13ca5db90f83b676579.tar.xz | |
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.
Diffstat (limited to 'player/sub.c')
| -rw-r--r-- | player/sub.c | 5 |
1 files changed, 1 insertions, 4 deletions
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; |