From ae1aeab7aa2b7c378a9f734d227121f84ae85ed2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 1 Mar 2020 00:28:09 +0100 Subject: options: make decoder options local to decoder wrapper Instead of having f_decoder_wrapper create its own copy of the entire mpv option tree, create a struct local to that file and move all used options to there. movie_aspect is used by the "video-aspect" deprecated property code. I think it's probably better not to remove the property yet, but fortunately it's easy to work around without needing special handling for this option or so. correct_pts is used to prevent use of hr-seek in playloop.c. Ignore that, if you use --no-correct-pts you're asking for trouble anyway. This is the only behavior change. --- player/playloop.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'player/playloop.c') diff --git a/player/playloop.c b/player/playloop.c index 113feea770..6fcd986ebd 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -289,8 +289,7 @@ static void mp_seek(MPContext *mpctx, struct seek_params seek) double demux_pts = seek_pts; - bool hr_seek = (opts->correct_pts && seek.exact != MPSEEK_KEYFRAME && - seek_pts != MP_NOPTS_VALUE) && + bool hr_seek = seek.exact != MPSEEK_KEYFRAME && seek_pts != MP_NOPTS_VALUE && (seek.exact >= MPSEEK_EXACT || opts->hr_seek == 1 || (opts->hr_seek >= 0 && seek.type == MPSEEK_ABSOLUTE) || (opts->hr_seek == 2 && (!mpctx->vo_chain || mpctx->vo_chain->is_sparse))); -- cgit v1.2.3