[FFmpeg-cvslog] avfilter/scale: don't fail for circular expressions

[Gyan Doshi]

ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Sun Jan 26 21:24:53 2020 +0530| [6e6b34917e0717e8844b962cfa413e71f9cdb72d] | committer: Gyan Doshi

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e6b34917e0717e8844b962cfa413e71f9cdb72d
---

 libavfilter/vf_scale.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 &&