diff options
Diffstat (limited to 'video/out/gl_video.c')
-rw-r--r-- | video/out/gl_video.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 8f4f7e8cbd..e991c85857 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -361,8 +361,7 @@ const struct m_sub_options gl_video_conf = { OPT_FLAG("pbo", pbo, 0), OPT_STRING_VALIDATE("lscale", scalers[0], 0, validate_scaler_opt), OPT_STRING_VALIDATE("cscale", scalers[1], 0, validate_scaler_opt), - OPT_STRING_VALIDATE("lscale-down", dscalers[0], 0, validate_scaler_opt), - OPT_STRING_VALIDATE("cscale-down", dscalers[1], 0, validate_scaler_opt), + OPT_STRING_VALIDATE("lscale-down", dscaler, 0, validate_scaler_opt), OPT_FLOAT("lparam1", scaler_params[0][0], 0), OPT_FLOAT("lparam2", scaler_params[0][1], 0), OPT_FLOAT("cparam1", scaler_params[1][0], 0), @@ -407,6 +406,7 @@ const struct m_sub_options gl_video_conf = { OPT_COLOR("background", background, 0), OPT_REMOVED("approx-gamma", "this is always enabled now"), + OPT_REMOVED("cscale-down", "use 'indirect' and lscale-down"), {0} }, .size = sizeof(struct gl_video_opts), @@ -1435,8 +1435,8 @@ static const char *expected_scaler(struct gl_video *p, int unit) { return "bilinear"; } - if (p->opts.dscalers[unit] && get_scale_factor(p) < 1.0) - return p->opts.dscalers[unit]; + if (unit == 0 && p->opts.dscaler && get_scale_factor(p) < 1.0) + return p->opts.dscaler; return p->opts.scalers[unit]; } @@ -2609,7 +2609,7 @@ void gl_video_set_options(struct gl_video *p, struct gl_video_opts *opts) p->opts = *opts; for (int n = 0; n < 2; n++) { p->opts.scalers[n] = (char *)handle_scaler_opt(p->opts.scalers[n]); - p->opts.dscalers[n] = (char *)handle_scaler_opt(p->opts.dscalers[n]); + p->opts.dscaler = (char *)handle_scaler_opt(p->opts.dscaler); } if (!p->opts.gamma && p->video_eq.values[MP_CSP_EQ_GAMMA] != 0) |