diff options
author | wm4 <wm4@nowhere> | 2014-07-15 01:49:02 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-07-15 01:49:02 +0200 |
commit | 23a7257cca5982fa44300825ea489ba95a7e4c17 (patch) | |
tree | 5c03e6b1e0127d2e6b72fa168ea0dce8294ca122 /player/loadfile.c | |
parent | 4b93210e0c244a65ef10a566abed2ad25ecaf9a1 (diff) | |
download | mpv-23a7257cca5982fa44300825ea489ba95a7e4c17.tar.bz2 mpv-23a7257cca5982fa44300825ea489ba95a7e4c17.tar.xz |
Revert "Remove DVD and Bluray support"
This reverts commit 4b93210e0c244a65ef10a566abed2ad25ecaf9a1.
*shrug*
Diffstat (limited to 'player/loadfile.c')
-rw-r--r-- | player/loadfile.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 3f131d1df6..e2a1e6e145 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1050,6 +1050,9 @@ static void play_current_file(struct MPContext *mpctx) goto terminate_playback; } + // Must be called before enabling cache. + mp_nav_init(mpctx); + int res = stream_enable_cache(&mpctx->stream, &opts->stream_cache); if (res == 0) if (demux_was_interrupted(mpctx)) @@ -1059,6 +1062,8 @@ static void play_current_file(struct MPContext *mpctx) goto_reopen_demuxer: ; + mp_nav_reset(mpctx); + //============ Open DEMUXERS --- DETECT file type ======================= mpctx->audio_delay = opts->audio_delay; @@ -1266,6 +1271,8 @@ goto_reopen_demuxer: ; terminate_playback: + mp_nav_destroy(mpctx); + if (mpctx->stop_play == KEEP_PLAYING) mpctx->stop_play = AT_END_OF_FILE; |