summaryrefslogtreecommitdiffstats
path: root/player/misc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-15 01:49:02 +0200
committerwm4 <wm4@nowhere>2014-07-15 01:49:02 +0200
commit23a7257cca5982fa44300825ea489ba95a7e4c17 (patch)
tree5c03e6b1e0127d2e6b72fa168ea0dce8294ca122 /player/misc.c
parent4b93210e0c244a65ef10a566abed2ad25ecaf9a1 (diff)
downloadmpv-23a7257cca5982fa44300825ea489ba95a7e4c17.tar.bz2
mpv-23a7257cca5982fa44300825ea489ba95a7e4c17.tar.xz
Revert "Remove DVD and Bluray support"
This reverts commit 4b93210e0c244a65ef10a566abed2ad25ecaf9a1. *shrug*
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 3da404f7ea..abaf5b208a 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -112,6 +112,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->start_time;
}