This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/6.1 in repository ffmpeg.
commit b19ed83f610278be55a7ca987d4e0471aa9024f6 Author: Michael Niedermayer <[email protected]> AuthorDate: Wed Jan 7 03:05:34 2026 +0100 Commit: Michael Niedermayer <[email protected]> CommitDate: Mon May 4 17:13:13 2026 +0200 avfilter/scale_eval: Use 64bit for factor_w/h Avoids truncation and overflows Fixes: #YWH-PGM40646-14 Found-by: An0n99X Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 5bbc8f828e85a4a2ded42f7d46b2ce8e2657433d) Signed-off-by: Michael Niedermayer <[email protected]> --- libavfilter/scale_eval.c | 2 +- libavfilter/vf_zscale.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/scale_eval.c b/libavfilter/scale_eval.c index 0c575a073d..f2741e1aaf 100644 --- a/libavfilter/scale_eval.c +++ b/libavfilter/scale_eval.c @@ -124,7 +124,7 @@ int ff_scale_adjust_dimensions(AVFilterLink *inlink, int force_original_aspect_ratio, int force_divisible_by) { int64_t w, h; - int factor_w, factor_h; + int64_t factor_w, factor_h; w = *ret_w; h = *ret_h; diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index 8d10951e3e..0b9c77acd6 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -252,7 +252,7 @@ static int config_props(AVFilterLink *outlink) double var_values[VARS_NB], res; char *expr; int ret; - int factor_w, factor_h; + int64_t factor_w, factor_h; var_values[VAR_IN_W] = var_values[VAR_IW] = inlink->w; var_values[VAR_IN_H] = var_values[VAR_IH] = inlink->h; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
