diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /player/playloop.c | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'player/playloop.c')
| -rw-r--r-- | player/playloop.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/player/playloop.c b/player/playloop.c index 9db9396f95..e73ad61788 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -28,6 +28,7 @@ #include "options/options.h" #include "common/common.h" #include "common/encode.h" +#include "common/recorder.h" #include "options/m_config.h" #include "options/m_property.h" #include "common/playlist.h" @@ -330,6 +331,8 @@ static void mp_seek(MPContext *mpctx, struct seek_params seek) clear_audio_output_buffers(mpctx); reset_playback_state(mpctx); + if (mpctx->recorder) + mp_recorder_mark_discontinuity(mpctx->recorder); /* Use the target time as "current position" for further relative * seeks etc until a new video frame has been decoded */ @@ -663,6 +666,9 @@ static void handle_pause_on_low_cache(struct MPContext *mpctx) force_update = true; } + if (s.eof && !busy) + prefetch_next(mpctx); + if (force_update) mp_notify(mpctx, MP_EVENT_CACHE_UPDATE, NULL); } |