summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-30 07:31:02 +0200
committerwm4 <wm4@nowhere>2014-03-30 17:54:50 +0200
commitcc1f92644113b598137d1654c216ad49127ba92b (patch)
tree8a14f9ed27339be5b3fb50c16359d8d6b4efe67e
parent67f653324a5ba205a66a1760209b71c2eec8e856 (diff)
downloadmpv-cc1f92644113b598137d1654c216ad49127ba92b.tar.bz2
mpv-cc1f92644113b598137d1654c216ad49127ba92b.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.
-rw-r--r--player/misc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/player/misc.c b/player/misc.c
index eb8c0c147e..cfb995f59a 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -106,6 +106,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);
}