diff options
| author | Gyan Doshi <ffmpeg@gyani.pro> | 2019-12-04 16:03:11 +0530 |
|---|---|---|
| committer | Gyan Doshi <ffmpeg@gyani.pro> | 2019-12-06 10:19:47 +0530 |
| commit | b66a800877d6f97fa94b41533e3d6a6273f7fb9f (patch) | |
| tree | 723d481af618e9a1ceaa2e1de545e18a7c6396e4 | |
| parent | 71fd72070c867b4f442e5c71baab9775c51273dc (diff) | |
| download | ffmpeg-b66a800877d6f97fa94b41533e3d6a6273f7fb9f.tar.gz | |
avfilter/crop: avoid premature eval error
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.
| -rw-r--r-- | libavfilter/vf_crop.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index d6b4feb513..9bf4077c5d 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -174,10 +174,9 @@ static int config_input(AVFilterLink *link) s->vsub = pix_desc->log2_chroma_h; } - if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr), - var_names, s->var_values, - NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) - goto fail_expr; + av_expr_parse_and_eval(&res, (expr = s->w_expr), + var_names, s->var_values, + NULL, NULL, NULL, NULL, NULL, 0, ctx); s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res; if ((ret = av_expr_parse_and_eval(&res, (expr = s->h_expr), var_names, s->var_values, |