diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-17 17:23:48 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-17 17:33:00 +0200 |
| commit | c96786008172f669e546ca987e7aaa3c3469be71 (patch) | |
| tree | fe52cabf10d3500dc46cc7fa54f0c60f3e3370c4 | |
| parent | e93d3334a94ed6d23380bd421c9bfe8984785c07 (diff) | |
| download | ffmpeg-c96786008172f669e546ca987e7aaa3c3469be71.tar.gz | |
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 <stefano.sabatini-lala@poste.it>
| -rw-r--r-- | libavfilter/vf_scale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 1e8a194622..9c3868baf4 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, |