|
|
|
@@ -165,12 +165,12 @@ static int config_props(AVFilterLink *outlink) |
|
|
|
av_expr_parse_and_eval(&res, (expr = scale->w_expr), |
|
|
|
var_names, var_values, |
|
|
|
NULL, NULL, NULL, NULL, NULL, 0, ctx); |
|
|
|
scale->w = var_values[VAR_OW] = res; |
|
|
|
scale->w = var_values[VAR_OUT_W] = var_values[VAR_OW] = res; |
|
|
|
if ((ret = av_expr_parse_and_eval(&res, (expr = scale->h_expr), |
|
|
|
var_names, var_values, |
|
|
|
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) |
|
|
|
goto fail; |
|
|
|
scale->h = var_values[VAR_OH] = res; |
|
|
|
scale->h = var_values[VAR_OUT_H] = var_values[VAR_OH] = res; |
|
|
|
/* evaluate again the width, as it may depend on the output height */ |
|
|
|
if ((ret = av_expr_parse_and_eval(&res, (expr = scale->w_expr), |
|
|
|
var_names, var_values, |
|
|
|
|