---
libavfilter/vf_crop.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 64b0ba7..ffb4c5b 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -169,16 +169,20 @@ static int config_input(AVFilterLink *link)
if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
var_names, s->var_values,
- NULL, NULL, NULL, NULL, NULL, 0, ctx)) <
0) goto fail_expr;
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) <
0)
+ goto fail_expr;
s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res;
if ((ret = av_expr_parse_and_eval(&res, (expr = s->oh_expr),
var_names, s->var_values,
- NULL, NULL, NULL, NULL, NULL, 0, ctx)) <
0) goto fail_expr;
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) <
0)
+ goto fail_expr;
s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = res;
/* evaluate again ow as it may depend on oh */
if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
var_names, s->var_values,
- NULL, NULL, NULL, NULL, NULL, 0, ctx)) <
0) goto fail_expr;
+ NULL, NULL, NULL, NULL, NULL, 0, ctx)) <
0)
+ goto fail_expr;
+
s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res;
if (normalize_double(&s->w, s->var_values[VAR_OUT_W]) < 0 ||
normalize_double(&s->h, s->var_values[VAR_OUT_H]) < 0) {
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
