summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-30 23:30:08 +0100
committerwm4 <wm4@nowhere>2015-01-30 23:42:01 +0100
commit3813c3804f817d09d6df38363736b3b756901790 (patch)
tree230584fe8e23e8fe9f8f31fa4e7f3edcc7c3c98b
parent12d822ce44a6d6bcb981429feb24044cf92b13bc (diff)
downloadmpv-3813c3804f817d09d6df38363736b3b756901790.tar.bz2
mpv-3813c3804f817d09d6df38363736b3b756901790.tar.xz
Revert "player: allow seeking audio between video frames"
This reverts commit 7b3feecbc23e3e0b0d9cf66f02af53d127a0b681. It's broken, hr-seek never ends at a video position before seek pts. Not sure what I was thinking, although it did work anyway when artificially forcing a video frame to display before seek pts.
-rw-r--r--player/video.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/player/video.c b/player/video.c
index c75603da10..0795b66cbd 100644
--- a/player/video.c
+++ b/player/video.c
@@ -588,16 +588,8 @@ static int video_output_image(struct MPContext *mpctx, double endpts)
frame_time = 0;
}
mpctx->video_next_pts = pts;
- if (mpctx->d_audio) {
+ if (mpctx->d_audio)
mpctx->delay -= frame_time;
- // When resuming after a hr-seek, let audio advance the position to
- // the actual seek target.
- if (mpctx->video_status == STATUS_SYNCING && mpctx->hrseek_active &&
- pts != MP_NOPTS_VALUE)
- {
- mpctx->delay -= mpctx->hrseek_pts - pts;
- }
- }
if (mpctx->video_status >= STATUS_READY) {
mpctx->time_frame += frame_time / mpctx->opts->playback_speed;
adjust_sync(mpctx, pts, frame_time);