wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avfilter/vf_scale: set correct AVFrame SAR if reset_sar=1

Browse source 
This otherwise generates an inconsistency between the frame state and the
link state, since the link state is set to 1:1 explicitly when `reset_sar`
is enabled, but this line of code unconditionally overwrote the output
frame SAR with the value that would be computed in the absence of `reset_sar`.

cf. vf_scale_cuda, which does this correctly
This commit is contained in:
Niklas Haas 2025-06-16 19:48:11 +02:00
parent e6fb8f373e
commit 04ceabe2ba
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libavfilter/vf_scale.c
View file

@ -854,10 +854,14 @@ scale:
AV_SIDE_DATA_PROP_COLOR_DEPENDENT); AV_SIDE_DATA_PROP_COLOR_DEPENDENT);
} }
av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den, if (scale->reset_sar) {
(int64_t)in->sample_aspect_ratio.num * outlink->h * link->w, out->sample_aspect_ratio = outlink->sample_aspect_ratio;
(int64_t)in->sample_aspect_ratio.den * outlink->w * link->h, } else {
INT_MAX); av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den,
(int64_t)in->sample_aspect_ratio.num * outlink->h * link->w,
(int64_t)in->sample_aspect_ratio.den * outlink->w * link->h,
INT_MAX);
}
if (sws_is_noop(out, in)) { if (sws_is_noop(out, in)) {
av_frame_free(&out); av_frame_free(&out);