diff options
author | wm4 <wm4@nowhere> | 2016-01-12 23:48:28 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-01-12 23:48:28 +0100 |
commit | 6fc0fe4426c1b71630d281cbc9e0406f8ad7deee (patch) | |
tree | 8d1524ec2cf01b32edd8b9fd143c46f17cbc0e9a | |
parent | 671df54e4dcf0675c335483d26f7f6ff9baaf76a (diff) |
player: handle hrseek framedrop correctly
This was non-sense and checked the option instead of the actual flag.
Possibly could lead to incorrect hr-seeks.
-rw-r--r-- | player/playloop.c | 2 | ||||
-rw-r--r-- | player/video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/player/playloop.c b/player/playloop.c index 382a1c4b27..4d3e70b4f7 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -293,7 +293,7 @@ static int mp_seek(MPContext *mpctx, struct seek_params seek, // seeking past the chapter is handled elsewhere. if (hr_seek || mpctx->timeline) { mpctx->hrseek_active = true; - mpctx->hrseek_framedrop = !hr_seek_very_exact; + mpctx->hrseek_framedrop = !hr_seek_very_exact && opts->hr_seek_framedrop; mpctx->hrseek_pts = hr_seek ? seek.amount : mpctx->timeline[mpctx->timeline_part].start; diff --git a/player/video.c b/player/video.c index d54f048038..28c6ac4d5c 100644 --- a/player/video.c +++ b/player/video.c @@ -394,7 +394,7 @@ static int decode_image(struct MPContext *mpctx) bool hrseek = mpctx->hrseek_active && mpctx->video_status == STATUS_SYNCING; int framedrop_type = check_framedrop(mpctx); if (hrseek && pkt && pkt->pts < mpctx->hrseek_pts - .005 && - !d_video->has_broken_packet_pts && mpctx->opts->hr_seek_framedrop) + !d_video->has_broken_packet_pts && mpctx->hrseek_framedrop) { framedrop_type = 2; } |