From c96786008172f669e546ca987e7aaa3c3469be71 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 17 Apr 2011 17:23:48 +0200 Subject: scale: set evaluated value for the "out_w" and "out_h" constants The constant values were never set, thus the evaluation of expressions referencing those constants were resulting in an error. Signed-off-by: Stefano Sabatini --- libavfilter/vf_scale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 1e8a194..9c3868b 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -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, -- cgit v1.1