Browse Source

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.
Gyan Doshi 5 years ago
parent
commit
6e6b34917e
1 changed files with 1 additions and 2 deletions
  1. 1 2
      libavfilter/vf_scale.c

+ 1 - 2
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 &&