summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-29 00:24:51 +0100
committerwm4 <wm4@nowhere>2014-11-29 00:27:17 +0100
commita937ba203dfad2b3d0a5dd349015cc608c8d6dd4 (patch)
tree757131db18cfe94accbef5221f8a31b68c53b79e /player
parent9e10f8ccbb4a296ebd1cdf4e0908c84a8bfcfe31 (diff)
downloadmpv-a937ba203dfad2b3d0a5dd349015cc608c8d6dd4.tar.bz2
mpv-a937ba203dfad2b3d0a5dd349015cc608c8d6dd4.tar.xz
player: reset frame step counter on seeks
I suppose this wasn't done in order to keep the frame step counter active even in the next file, but actually it was reset anyway.
Diffstat (limited to 'player')
-rw-r--r--player/loadfile.c1
-rw-r--r--player/playloop.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 3c001ddeaa..bb5a27af07 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -903,7 +903,6 @@ static void play_current_file(struct MPContext *mpctx)
mpctx->paused = false;
mpctx->paused_for_cache = false;
mpctx->playing_msg_shown = false;
- mpctx->step_frames = 0;
mpctx->backstep_active = false;
mpctx->audio_delay = 0;
mpctx->max_frames = -1;
diff --git a/player/playloop.c b/player/playloop.c
index 190bc3f98c..21c8eff50a 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -154,6 +154,7 @@ void reset_playback_state(struct MPContext *mpctx)
mpctx->playback_pts = MP_NOPTS_VALUE;
mpctx->last_seek_pts = MP_NOPTS_VALUE;
mpctx->cache_wait_time = 0;
+ mpctx->step_frames = 0;
mpctx->restart_complete = false;
#if HAVE_ENCODING