diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 10:14:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-16 10:14:00 +0200 |
| commit | a134f9676e4f7988d360b69e0aed176055c47bcb (patch) | |
| tree | 6add5d612f09d99ab5e4041711b14e591f36f5bf /libavfilter/vf_crop.c | |
| parent | e77647c52863189508a4f995821f86ccb42a4b32 (diff) | |
| parent | ba09675f44612fad9f7169f71b8276beb50a0dcd (diff) | |
| download | ffmpeg-a134f9676e4f7988d360b69e0aed176055c47bcb.tar.gz | |
Merge commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd'
* commit 'ba09675f44612fad9f7169f71b8276beb50a0dcd':
vf_delogo: use the name 's' for the pointer to the private context
vf_cropdetect: use the name 's' for the pointer to the private context
vf_crop: cosmetics, break lines
Conflicts:
libavfilter/vf_delogo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_crop.c')
| -rw-r--r-- | libavfilter/vf_crop.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c index 829d0bb422..4edb7cfb05 100644 --- a/libavfilter/vf_crop.c +++ b/libavfilter/vf_crop.c @@ -178,16 +178,20 @@ static int config_input(AVFilterLink *link) 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; + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) + goto fail_expr; 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, - 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; /* evaluate again ow as it may depend on oh */ 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; + NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) + goto fail_expr; + s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res; if (normalize_double(&s->w, s->var_values[VAR_OUT_W]) < 0 || normalize_double(&s->h, s->var_values[VAR_OUT_H]) < 0) { |