videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

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
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/vf_scale.c
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 &&