History

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 committed 6 years ago

Commit 6e6b3491 parent ecd95851 file · +1 −2Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_scale.c+1−2
@@ -184,8 +184,7 @@ static int check_exprs(AVFilterContext *ctx) · 183 unmodified lines
184 184
185 if ((vars_w[VAR_OUT_H] || vars_w[VAR_OH]) &&185 if ((vars_w[VAR_OUT_H] || vars_w[VAR_OH]) &&
186 (vars_h[VAR_OUT_W] || vars_h[VAR_OW])) {186 (vars_h[VAR_OUT_W] || vars_h[VAR_OW])) {
187 av_log(ctx, AV_LOG_ERROR, "Circular expressions invalid for width '%s' and height '%s'.\n", scale->w_expr, scale->h_expr);187 av_log(ctx, AV_LOG_WARNING, "Circular references detected for width '%s' and height '%s' - possibly invalid.\n", scale->w_expr, scale->h_expr);
188 return AVERROR(EINVAL);
189 }188 }
190 189
191 if (ctx->filter != &ff_vf_scale2ref &&190 if (ctx->filter != &ff_vf_scale2ref &&

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t