summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-11 19:13:22 +0200
committerwm4 <wm4@nowhere>2013-07-11 19:13:22 +0200
commit8a3615f2d8a902bc5aaf12550eb26f4d3f40c7ae (patch)
tree67d7d2417d7321f1437b1375aa6ee04122a716c3 /core
parenta5224836293ac02bd13f688cfc848aae6818e963 (diff)
downloadmpv-8a3615f2d8a902bc5aaf12550eb26f4d3f40c7ae.tar.bz2
mpv-8a3615f2d8a902bc5aaf12550eb26f4d3f40c7ae.tar.xz
mplayer: don't set bogus video pts after seek reset
As the comment n the removed code says, this was once needed for something subtitle related. This code has been cleaned up long ago, so at least the original reason for it is gone.
Diffstat (limited to 'core')
-rw-r--r--core/mplayer.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 0d07b518d8..97bde0bc4d 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -2742,13 +2742,10 @@ static void seek_reset(struct MPContext *mpctx, bool reset_ao, bool reset_ac)
vf_chain_seek_reset(mpctx->sh_video->vfilter);
mpctx->sh_video->num_buffered_pts = 0;
mpctx->sh_video->last_pts = MP_NOPTS_VALUE;
+ mpctx->sh_video->pts = MP_NOPTS_VALUE;
+ mpctx->video_pts = MP_NOPTS_VALUE;
mpctx->delay = 0;
mpctx->time_frame = 0;
- // Not all demuxers set d_video->pts during seek, so this value
- // (which was used by at least vobsub code below) may be completely
- // wrong (probably 0).
- mpctx->sh_video->pts = mpctx->sh_video->ds->last_pts + mpctx->video_offset;
- mpctx->video_pts = mpctx->sh_video->pts;
}
if (mpctx->sh_audio && reset_ac) {