highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_libplacebo: fix normalize_sar calculation

Browse Source 
This previous expression multiplied a constant (outlink->h) that was
guaranteed to be 0 at this point, thus making it always a no-op.

Fix the calculation, and also properly reset the SAR to 1:1 as is now
necessary (the failure to do so previously hid this bug's existence).
This commit is contained in:
Niklas Haas 2022-11-18 14:57:08 +01:00
parent 05d390890a
commit 46a4cc460e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/vf_libplacebo.c
View File

@ -582,12 +582,13 @@ static int libplacebo_config_output(AVFilterLink *outlink)
s->force_original_aspect_ratio,
s->force_divisible_by);
scale_sar = (AVRational){outlink->h * inlink->w, *out_w * *out_h};
scale_sar = (AVRational){*out_h * inlink->w, *out_w * inlink->h};
if (inlink->sample_aspect_ratio.num)
scale_sar = av_mul_q(scale_sar, inlink->sample_aspect_ratio);
if (s->normalize_sar) {
/* Apply all SAR during scaling, so we don't need to set the out SAR */
outlink->sample_aspect_ratio = (AVRational){ 1, 1 };
s->target_sar = scale_sar;
} else {
/* This is consistent with other scale_* filters, which only