diff options
| author | Niklas Haas <git@haasn.dev> | 2022-11-18 14:57:08 +0100 |
|---|---|---|
| committer | Niklas Haas <git@haasn.dev> | 2022-11-19 14:15:47 +0100 |
| commit | 46a4cc460edfaff8e5b88198a7127a910a5ab72f (patch) | |
| tree | 473534e80a7407fd9dfd72195620999a6a263b97 | |
| parent | 05d390890a8b37add02fa8d742335006c7e67c9f (diff) | |
| download | ffmpeg-46a4cc460edfaff8e5b88198a7127a910a5ab72f.tar.gz | |
avfilter/vf_libplacebo: fix normalize_sar calculation
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).
| -rw-r--r-- | libavfilter/vf_libplacebo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 47a55ac311..ce57e7539e 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -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 |