This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/8.1 in repository ffmpeg.
commit 8db78165b3f6a138d7d01473b72e3c4b874ef9da Author: Michael Niedermayer <[email protected]> AuthorDate: Fri Jun 12 20:23:11 2026 +0200 Commit: Michael Niedermayer <[email protected]> CommitDate: Mon Jun 15 23:57:23 2026 +0200 avfilter/avf_showcwt: avoid undefined float to int conversion of nb_consumed_samples Reproduced with: ffmpeg -f lavfi -i "sine=frequency=440" -filter_complex \ "[0:a]showcwt=size=32x32:deviation=0[v]" -map "[v]" -f null - Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit b276ac07e85cb2bf0d4c1534c7fc067a24ebb6a1) Signed-off-by: Michael Niedermayer <[email protected]> --- libavfilter/avf_showcwt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 36e39ee788..a4cdc6be5a 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -808,6 +808,7 @@ static int config_output(AVFilterLink *outlink) float maximum_frequency = fminf(s->maximum_frequency, limit_frequency); float minimum_frequency = s->minimum_frequency; float scale = 1.f, factor; + double nb_samples; int ret; if (minimum_frequency >= maximum_frequency) { @@ -877,11 +878,11 @@ static int config_output(AVFilterLink *outlink) if (!s->frequency_band) return AVERROR(ENOMEM); - s->nb_consumed_samples = inlink->sample_rate * - frequency_band(s->frequency_band, - s->frequency_band_count, maximum_frequency - minimum_frequency, - minimum_frequency, s->frequency_scale, s->deviation); - s->nb_consumed_samples = FFMIN(s->nb_consumed_samples, 65536); + nb_samples = inlink->sample_rate * + frequency_band(s->frequency_band, + s->frequency_band_count, maximum_frequency - minimum_frequency, + minimum_frequency, s->frequency_scale, s->deviation); + s->nb_consumed_samples = av_clip(av_clipd(nb_samples, 1, 65536), 1, 65536); s->nb_threads = FFMIN(s->frequency_band_count, ff_filter_get_nb_threads(ctx)); s->nb_channels = inlink->ch_layout.nb_channels; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
