har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/crop: avoid premature eval error

Browse Source 
Width and height expressions can refer to each other. Width is
evaluated twice to allow for reference to output height. So we
should not error out upon failure of first evaluation of width.
This commit is contained in:
Gyan Doshi 2019-12-04 16:03:11 +05:30
parent 71fd72070c
commit b66a800877
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/vf_crop.c
View File

@ -174,10 +174,9 @@ static int config_input(AVFilterLink *link)
s->vsub = pix_desc->log2_chroma_h; s->vsub = pix_desc->log2_chroma_h;
} }
if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr), av_expr_parse_and_eval(&res, (expr = s->w_expr),
var_names, s->var_values, var_names, s->var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) NULL, NULL, NULL, NULL, NULL, 0, ctx);
goto fail_expr;
s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res; s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res;
if ((ret = av_expr_parse_and_eval(&res, (expr = s->h_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = s->h_expr),
var_names, s->var_values, var_names, s->var_values,