RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-11 06:58:18 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/pad: improve error check for w and h

Browse Source 
Target dimensions have to cover entire input.
This commit is contained in:
Gyan Doshi 2020-01-15 21:09:38 +05:30
parent f8990c5f41
commit 4de2106fbf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_pad.c
View File

@ -178,14 +178,14 @@ static int config_input(AVFilterLink *inlink)
if (s->y < 0 || s->y + inlink->h > s->h) if (s->y < 0 || s->y + inlink->h > s->h)
s->y = var_values[VAR_Y] = (s->h - inlink->h) / 2; s->y = var_values[VAR_Y] = (s->h - inlink->h) / 2;
s->w = ff_draw_round_to_sub(&s->draw, 0, -1, s->w);
s->h = ff_draw_round_to_sub(&s->draw, 1, -1, s->h);
/* sanity check params */ /* sanity check params */
if (s->w < 0 || s->h < 0) { if (s->w < inlink->w || s->h < inlink->h) {
av_log(ctx, AV_LOG_ERROR, "Negative values are not acceptable.\n"); av_log(ctx, AV_LOG_ERROR, "Padded dimensions cannot be smaller than input dimensions.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
s->w = ff_draw_round_to_sub(&s->draw, 0, -1, s->w);
s->h = ff_draw_round_to_sub(&s->draw, 1, -1, s->h);
s->x = ff_draw_round_to_sub(&s->draw, 0, -1, s->x); s->x = ff_draw_round_to_sub(&s->draw, 0, -1, s->x);
s->y = ff_draw_round_to_sub(&s->draw, 1, -1, s->y); s->y = ff_draw_round_to_sub(&s->draw, 1, -1, s->y);
s->in_w = ff_draw_round_to_sub(&s->draw, 0, -1, inlink->w); s->in_w = ff_draw_round_to_sub(&s->draw, 0, -1, inlink->w);