1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

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.
This commit is contained in:
Gyan Doshi 2020-01-26 21:06:53 +05:30
parent ecd95858d4
commit 6e6b34917e

View File

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