avfilter/vf_scale: set correct AVFrame SAR if reset_sar=1
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:
parent
e6fb8f373e
commit
04ceabe2ba
1 changed files with 8 additions and 4 deletions
|
|
@ -854,10 +854,14 @@ scale:
|
|||
AV_SIDE_DATA_PROP_COLOR_DEPENDENT);
|
||||
}
|
||||
|
||||
if (scale->reset_sar) {
|
||||
out->sample_aspect_ratio = outlink->sample_aspect_ratio;
|
||||
} else {
|
||||
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)) {
|
||||
av_frame_free(&out);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue