xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vf_crop: cosmetics, break lines

Browse Source
This commit is contained in:
Anton Khirnov 2013-03-18 21:48:18 +01:00
parent 7f83959598
commit 671563d9fd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_crop.c
View File

@ -167,16 +167,20 @@ static int config_input(AVFilterLink *link)
if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
var_names, s->var_values, var_names, s->var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr; NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
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->oh_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = s->oh_expr),
var_names, s->var_values, var_names, s->var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr; NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
goto fail_expr;
s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = res; s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = res;
/* evaluate again ow as it may depend on oh */ /* evaluate again ow as it may depend on oh */
if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr), if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
var_names, s->var_values, var_names, s->var_values,
NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr; NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0)
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 (normalize_double(&s->w, s->var_values[VAR_OUT_W]) < 0 || if (normalize_double(&s->w, s->var_values[VAR_OUT_W]) < 0 ||
normalize_double(&s->h, s->var_values[VAR_OUT_H]) < 0) { normalize_double(&s->h, s->var_values[VAR_OUT_H]) < 0) {