From 6e6b34917e0717e8844b962cfa413e71f9cdb72d Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sun, 26 Jan 2020 21:06:53 +0530 Subject: avfilter/scale: don't fail for circular expressions Due to conditional expressions, it is possible for them to be resolved successfully. A warning is still printed. --- libavfilter/vf_scale.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index d46c767e70..0348f19d33 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -184,8 +184,7 @@ static int check_exprs(AVFilterContext *ctx) if ((vars_w[VAR_OUT_H] || vars_w[VAR_OH]) && (vars_h[VAR_OUT_W] || vars_h[VAR_OW])) { - av_log(ctx, AV_LOG_ERROR, "Circular expressions invalid for width '%s' and height '%s'.\n", scale->w_expr, scale->h_expr); - return AVERROR(EINVAL); + av_log(ctx, AV_LOG_WARNING, "Circular references detected for width '%s' and height '%s' - possibly invalid.\n", scale->w_expr, scale->h_expr); } if (ctx->filter != &ff_vf_scale2ref && -- cgit v1.2.3