diff options
| author | Niklas Haas <git@haasn.dev> | 2023-08-27 13:58:50 +0200 |
|---|---|---|
| committer | Niklas Haas <github-daiK1o@haasn.dev> | 2023-08-27 14:39:45 +0200 |
| commit | 6fb9d92b25f5987d9d01201e018bd3650f610320 (patch) | |
| tree | dca6d3574f610e6389603890a67b8de93fa8215a /video | |
| parent | 23e9b57791c6788896b00d8ceadc7cf17153a35d (diff) | |
| download | mpv-6fb9d92b25f5987d9d01201e018bd3650f610320.tar.bz2 mpv-6fb9d92b25f5987d9d01201e018bd3650f610320.tar.xz | |
vo_gpu_next: correctly set params.frame_mixer
This was incorrectly adapted from the old options system, we forgot to
ever actually assign p->frame_mixer to params.frame_mixer.
Fixes: d2082841df8bc39c585fc9d4be6498d1a296fed8
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/vo_gpu_next.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c index 85d38e42c6..fb649370b6 100644 --- a/video/out/vo_gpu_next.c +++ b/video/out/vo_gpu_next.c @@ -143,7 +143,6 @@ struct priv { struct mp_csp_equalizer_state *video_eq; struct scaler_params scalers[SCALER_COUNT]; const struct pl_hook **hooks; // storage for `params.hooks` - const struct pl_filter_config *frame_mixer; enum mp_csp_levels output_levels; char **raw_opts; @@ -1952,11 +1951,11 @@ static void update_render_options(struct vo *vo) pars->params.upscaler = map_scaler(p, SCALER_SCALE); pars->params.downscaler = map_scaler(p, SCALER_DSCALE); pars->params.plane_upscaler = map_scaler(p, SCALER_CSCALE); - p->frame_mixer = opts->interpolation ? map_scaler(p, SCALER_TSCALE) : NULL; + pars->params.frame_mixer = opts->interpolation ? map_scaler(p, SCALER_TSCALE) : NULL; // Request as many frames as required from the decoder - if (p->frame_mixer) { - vo_set_queue_params(vo, 0, 2 + ceilf(p->frame_mixer->kernel->radius)); + if (pars->params.frame_mixer) { + vo_set_queue_params(vo, 0, 2 + ceilf(pars->params.frame_mixer->kernel->radius)); } else { vo_set_queue_params(vo, 0, 2); } |