From 8fc4cc982e9bdfc81f845d462cb971bb3067165f Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 23 Apr 2026 11:27:27 +0800 Subject: [PATCH] avfilter/vf_scale_vaapi: propagate ff_scale_adjust_dimensions() error ff_scale_adjust_dimensions() can now return a negative error code when the evaluated output dimensions are non-positive. Check the return value and fail fast instead of continuing with the unadjusted result. Signed-off-by: Jun Zhao --- libavfilter/vf_scale_vaapi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 1ba925afa5..78fa234e89 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -87,8 +87,11 @@ static int scale_vaapi_config_output(AVFilterLink *outlink) w_adj = inlink->sample_aspect_ratio.num ? (double)inlink->sample_aspect_ratio.num / inlink->sample_aspect_ratio.den : 1; - ff_scale_adjust_dimensions(inlink, &vpp_ctx->output_width, &vpp_ctx->output_height, - ctx->force_original_aspect_ratio, ctx->force_divisible_by, w_adj); + err = ff_scale_adjust_dimensions(inlink, &vpp_ctx->output_width, &vpp_ctx->output_height, + ctx->force_original_aspect_ratio, + ctx->force_divisible_by, w_adj); + if (err < 0) + return err; if (inlink->w == vpp_ctx->output_width && inlink->h == vpp_ctx->output_height && (vpp_ctx->input_frames->sw_format == vpp_ctx->output_format ||