summaryrefslogtreecommitdiffstats
path: root/player/misc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-30 07:31:02 +0200
committerwm4 <wm4@nowhere>2014-03-30 07:31:02 +0200
commit9be2f6b9f841d0169afb06aa82a8eb4f039bbdbe (patch)
tree82e9409bc5977ecd6862f50d31a254c89dfbcc2e /player/misc.c
parent8487bb2c549283d340ee73310b1a58b13f746864 (diff)
downloadmpv-9be2f6b9f841d0169afb06aa82a8eb4f039bbdbe.tar.bz2
mpv-9be2f6b9f841d0169afb06aa82a8eb4f039bbdbe.tar.xz
player: dvdnav: fix start time when entering and leaving menu
Unfortunately, quite a hack, because we have check the nav state outside of discnav.c.
Diffstat (limited to 'player/misc.c')
-rw-r--r--player/misc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/player/misc.c b/player/misc.c
index 1a52be6a82..5e3299645e 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -107,6 +107,10 @@ double get_start_time(struct MPContext *mpctx)
struct demuxer *demuxer = mpctx->demuxer;
if (!demuxer)
return 0;
+ // We reload the demuxer on menu transitions; don't make it use the first
+ // timestamp it finds as start PTS.
+ if (mpctx->nav_state)
+ return 0;
return demuxer_get_start_time(demuxer);
}