path: root/player/misc.c
diff options
authorwm4 <wm4@nowhere>2014-07-29 17:55:28 +0200
committerwm4 <wm4@nowhere>2014-07-29 17:55:28 +0200
commit862d7d8a1a852fc6bb6dd13ca5db90f83b676579 (patch)
tree1872938f935623b207cc9fd03ac3fa2e33176d41 /player/misc.c
parent6d15c491b063736d6915e74a9134d1cabde9a663 (diff)
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/misc.c')
1 files changed, 3 insertions, 2 deletions
diff --git a/player/misc.c b/player/misc.c
index e50ea6b143..3ae4a8ab9a 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -100,8 +100,9 @@ double get_main_demux_pts(struct MPContext *mpctx)
double main_new_pos = MP_NOPTS_VALUE;
if (mpctx->demuxer) {
for (int n = 0; n < mpctx->demuxer->num_streams; n++) {
- if (main_new_pos == MP_NOPTS_VALUE)
- main_new_pos = demux_get_next_pts(mpctx->demuxer->streams[n]);
+ struct sh_stream *stream = mpctx->demuxer->streams[n];
+ if (main_new_pos == MP_NOPTS_VALUE && stream->type != STREAM_SUB)
+ main_new_pos = demux_get_next_pts(stream);
return main_new_pos;