summaryrefslogtreecommitdiff
path: root/libavfilter/vf_scale.c
diff options
context:
space:
mode:
authorGyan Doshi <ffmpeg@gyani.pro>2020-01-26 21:06:53 +0530
committerGyan Doshi <ffmpeg@gyani.pro>2020-01-26 21:06:53 +0530
commit6e6b34917e0717e8844b962cfa413e71f9cdb72d (patch)
treebd91f5bad4e11dc38fca74ffb1b5cb19d1798589 /libavfilter/vf_scale.c
parentecd95858d4c760e24d337c5be186780d4a78f1ff (diff)
downloadffmpeg-6e6b34917e0717e8844b962cfa413e71f9cdb72d.tar.gz
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.
Diffstat (limited to 'libavfilter/vf_scale.c')
-rw-r--r--libavfilter/vf_scale.c3
1 files changed, 1 insertions, 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 &&