mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-07 01:54:17 +02:00
lavfi/vignette: make sure a sane sar is set.
This commit is contained in:
parent
0ab9362fcb
commit
4a85390d29
@ -269,6 +269,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
|
|||||||
static int config_props(AVFilterLink *inlink)
|
static int config_props(AVFilterLink *inlink)
|
||||||
{
|
{
|
||||||
VignetteContext *s = inlink->dst->priv;
|
VignetteContext *s = inlink->dst->priv;
|
||||||
|
AVRational sar = inlink->sample_aspect_ratio;
|
||||||
|
|
||||||
s->desc = av_pix_fmt_desc_get(inlink->format);
|
s->desc = av_pix_fmt_desc_get(inlink->format);
|
||||||
s->var_values[VAR_W] = inlink->w;
|
s->var_values[VAR_W] = inlink->w;
|
||||||
@ -277,12 +278,14 @@ static int config_props(AVFilterLink *inlink)
|
|||||||
s->var_values[VAR_R] = inlink->frame_rate.num == 0 || inlink->frame_rate.den == 0 ?
|
s->var_values[VAR_R] = inlink->frame_rate.num == 0 || inlink->frame_rate.den == 0 ?
|
||||||
NAN : av_q2d(inlink->frame_rate);
|
NAN : av_q2d(inlink->frame_rate);
|
||||||
|
|
||||||
if (inlink->sample_aspect_ratio.num > inlink->sample_aspect_ratio.den) {
|
if (!sar.num || !sar.den)
|
||||||
s->xscale = av_q2d(inlink->sample_aspect_ratio);
|
sar.num = sar.den = 1;
|
||||||
|
if (sar.num > sar.den) {
|
||||||
|
s->xscale = av_q2d(sar);
|
||||||
s->yscale = 1;
|
s->yscale = 1;
|
||||||
s->dmax = hypot(inlink->w / 2., s->yscale * inlink->h / 2.);
|
s->dmax = hypot(inlink->w / 2., s->yscale * inlink->h / 2.);
|
||||||
} else {
|
} else {
|
||||||
s->yscale = av_q2d(inlink->sample_aspect_ratio);
|
s->yscale = av_q2d(sar);
|
||||||
s->xscale = 1;
|
s->xscale = 1;
|
||||||
s->dmax = hypot(s->xscale * inlink->w / 2., inlink->h / 2.);
|
s->dmax = hypot(s->xscale * inlink->w / 2., inlink->h / 2.);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user