From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 9B0FC4C0DB for ; Tue, 7 Oct 2025 22:09:03 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'a1tm+/x8oIgsVVdqCSk3kgqyFPL8d85aeLs+7//Wtfw=', expected b'9bFujbVK/QUMXj3sViyvSvrBtgoIoufXrUEKXL1ro8A=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759874932; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=a1tm+/x8oIgsVVdqCSk3kgqyFPL8d85aeLs+7//Wtfw=; b=3MQr09jge6me4NprixvGxjSkkgHX+D+Gksg9jKyMfjpPYMZ7RQAfsm1+wYojhLXLUp8bh h/HHcXmRhqsgR1eZiMYbzBlPzLf4pw000Cst2ydJ8ScF+ZejsBVu9pHPdCNd/IoWc6m02v4 n58Qj1/Pw+MZIN/XOrQOYF58D3femcU4gJN8k1PLZNBiXOQsOk44McM42tYa0tgKMysdbBU 5XjSJj3Zp71GpulUaDYtVwtrJtBzvFbYWh+I1jQoFD5n7jACSaoRKLosmBTpTmusmjs8JKQ D8cdg208QK4UXAMef95iZ6IP532fp6DPxfzdDT0lTnsDcI6gvNQ+/eJAwaOw== Received: from [172.18.0.2] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id D055768F0D3; Wed, 8 Oct 2025 01:08:52 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1759874908; b=Cy9v1OBuhpUnqqb8p4MkvFm5EwJVz/SCdLc1vTik3Atjb0+RoshOvJaDwnUB1mkDH6J4X DtehQZ8SMKVAqC2D3G/FrPfVI3Dxg9WXiGv4twqudTD2F17+YFnF7V2By38+ZmlGJzFj9aY lgXJ/CAaNjIbYDiSKv2FsJPZN82ZsAirIMYQQIulITmxNPkpb14imjhkoBbZpCjQMBZHFT0 JwtLff3d/Tc+cRcRNVjPYZTqspQdbi+FayCBN2Qe6zG2yciCvZHR7VKZJfC8kCc/WR0bdZM fYw9vnkWtQ0dAPpHHp+wvgeqAf/HFCahZPjKYmDilVA0C8S1Zh5CRalJaKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1759874908; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=6b/bx+q/6+Nyppe+uSIrrfjMv3FuG53jf2nU3T22Rko=; b=HenVPLWJjzWydV92eWB6b1xs58IW8AX44t7UiszVTzotGFmFFwhqvbyXlyGJyq6fl8tv5 2BKFRxd42T6h5KUjRCt2Wn3I7kab3Sorhw4QopPVYbaSDCeSib2m2xR56AjFH+ZJHfGMLBp C1pOrhhAiT1p7QcMi/zS6Hp/yQSYAcq+Wt71K3kAyS5lDrnMBUvzPd3xRns5a7te10itwrW j3ZMv2XVwgtm2gWr0HCPSYWMJmBcgBzlRuspC9RxYWnhY6kZYAKt2EUjFJaK/5QqiqOB6+2 5q8gnrP6bX59++istoNxx1k/n0ypl0Lyd4vmuT6x2I3S/TvCHFz7nOQCGwAA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1759874902; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=9bFujbVK/QUMXj3sViyvSvrBtgoIoufXrUEKXL1ro8A=; b=LMvwb11K6uQCBXjIoGChg1zgdpakpfxgO+3ZFeO/P+JgIkKAd+JRjLFARe5fb1/1LeNVN TBctPEvTR9RAmt7IC+7+oQ4w1fB9Dvz9nUgfPHMYASK5lSI/2nk8JiuARgR4k5p2j8PFLbG L/gOkGPYZtColYdx6rLURz9HLIdBThcCAZYLbqJD8r/gf0FbB9AJYbN/vZf7PQ1WJkj41cC KDnUCKhwy6p3l2PC9P7cfuZyRDURN1CH8rXGjtoGZ3GTMcF9O8F6/B5tPR/GwsRhGGGsVdq yYANqgXXzcDizDqH3uKb9xehm/wDif/IZEiy6YtKpb3ClL5EpvdQji8XxO7g== Received: from be50bb5a3685 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 7A30A68F030 for ; Wed, 8 Oct 2025 01:08:22 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 07 Oct 2025 22:08:22 -0000 Message-ID: <175987490261.65.10254350874298881934@bf249f23a2c8> Message-ID-Hash: H37G7MV7THPF6RER3KGWQ3DWF7CW75EJ X-Message-ID-Hash: H37G7MV7THPF6RER3KGWQ3DWF7CW75EJ X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] general: fix warning 'av_malloc_array' sizes specified with 'sizeof' (PR #20663) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Baptiste Coudurier via ffmpeg-devel Cc: Baptiste Coudurier Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20663 opened by Baptiste Coudurier (bcoudurier) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20663 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20663.patch in the earlier argument and not in the later argument [-Wcalloc-transposed-args] Fixes trac ticket #11620 >>From ef60d5ac32a71d62e09630acc73b56f09a7d5ef2 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Fri, 6 Jun 2025 13:42:28 -0700 Subject: [PATCH] general: fix warning 'av_malloc_array' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] Fixes trac ticket #11620 --- libavcodec/dsddec.c | 2 +- libavcodec/vaapi_encode.c | 4 ++-- libavcodec/vorbisenc.c | 10 +++++----- libavfilter/af_arnndn.c | 6 +++--- libavfilter/af_astats.c | 2 +- libavfilter/af_silencedetect.c | 2 +- libavfilter/formats.c | 2 +- libavfilter/vf_libopencv.c | 2 +- libavfilter/vf_pixdesctest.c | 2 +- libavutil/hwcontext_vulkan.c | 2 +- libavutil/side_data.c | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index 793cfc9f06..aa8577d667 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -52,7 +52,7 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_init_dsd_data(); - s = av_malloc_array(sizeof(DSDContext), avctx->ch_layout.nb_channels); + s = av_malloc_array(avctx->ch_layout.nb_channels, sizeof(*s)); if (!s) return AVERROR(ENOMEM); diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index ed62347c06..0e50602e1f 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -52,7 +52,7 @@ static int vaapi_encode_make_packed_header(AVCodecContext *avctx, .has_emulation_bytes = 1, }; - tmp = av_realloc_array(pic->param_buffers, sizeof(*tmp), pic->nb_param_buffers + 2); + tmp = av_realloc_array(pic->param_buffers, pic->nb_param_buffers + 2, sizeof(*tmp)); if (!tmp) return AVERROR(ENOMEM); pic->param_buffers = tmp; @@ -93,7 +93,7 @@ static int vaapi_encode_make_param_buffer(AVCodecContext *avctx, VABufferID *tmp; VABufferID buffer; - tmp = av_realloc_array(pic->param_buffers, sizeof(*tmp), pic->nb_param_buffers + 1); + tmp = av_realloc_array(pic->param_buffers, pic->nb_param_buffers + 1, sizeof(*tmp)); if (!tmp) return AVERROR(ENOMEM); pic->param_buffers = tmp; diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index b4680a11ed..ab30dd49ed 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -463,11 +463,11 @@ static int create_vorbis_context(vorbis_enc_context *venc, venc->modes[1].mapping = 0; venc->have_saved = 0; - venc->saved = av_malloc_array(sizeof(float) * venc->channels, (1 << venc->log2_blocksize[1]) / 2); - venc->samples = av_malloc_array(sizeof(float) * venc->channels, (1 << venc->log2_blocksize[1])); - venc->floor = av_malloc_array(sizeof(float) * venc->channels, (1 << venc->log2_blocksize[1]) / 2); - venc->coeffs = av_malloc_array(sizeof(float) * venc->channels, (1 << venc->log2_blocksize[1]) / 2); - venc->scratch = av_malloc_array(sizeof(float) * venc->channels, (1 << venc->log2_blocksize[1])); + venc->saved = av_malloc_array((1 << venc->log2_blocksize[1]) / 2, sizeof(float) * venc->channels); + venc->samples = av_malloc_array((1 << venc->log2_blocksize[1]), sizeof(float) * venc->channels); + venc->floor = av_malloc_array((1 << venc->log2_blocksize[1]) / 2, sizeof(float) * venc->channels); + venc->coeffs = av_malloc_array((1 << venc->log2_blocksize[1]) / 2, sizeof(float) * venc->channels); + venc->scratch = av_malloc_array((1 << venc->log2_blocksize[1]), sizeof(float) * venc->channels); if (!venc->saved || !venc->samples || !venc->floor || !venc->coeffs || !venc->scratch) return AVERROR(ENOMEM); diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c index 27a35c8492..8bdc218781 100644 --- a/libavfilter/af_arnndn.c +++ b/libavfilter/af_arnndn.c @@ -361,9 +361,9 @@ static int config_input(AVFilterLink *inlink) DenoiseState *st = &s->st[i]; st->rnn[0].model = s->model[0]; - st->rnn[0].vad_gru_state = av_calloc(sizeof(float), FFALIGN(s->model[0]->vad_gru_size, 16)); - st->rnn[0].noise_gru_state = av_calloc(sizeof(float), FFALIGN(s->model[0]->noise_gru_size, 16)); - st->rnn[0].denoise_gru_state = av_calloc(sizeof(float), FFALIGN(s->model[0]->denoise_gru_size, 16)); + st->rnn[0].vad_gru_state = av_calloc(FFALIGN(s->model[0]->vad_gru_size, 16), sizeof(float)); + st->rnn[0].noise_gru_state = av_calloc(FFALIGN(s->model[0]->noise_gru_size, 16), sizeof(float)); + st->rnn[0].denoise_gru_state = av_calloc(FFALIGN(s->model[0]->denoise_gru_size, 16), sizeof(float)); if (!st->rnn[0].vad_gru_state || !st->rnn[0].noise_gru_state || !st->rnn[0].denoise_gru_state) diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index e5be00ec0b..6ef69ff102 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -210,7 +210,7 @@ static int config_output(AVFilterLink *outlink) { AudioStatsContext *s = outlink->src->priv; - s->chstats = av_calloc(sizeof(*s->chstats), outlink->ch_layout.nb_channels); + s->chstats = av_calloc(outlink->ch_layout.nb_channels, sizeof(*s->chstats)); if (!s->chstats) return AVERROR(ENOMEM); diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index 532f6b08af..bcdc90f8e3 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -176,7 +176,7 @@ static int config_input(AVFilterLink *inlink) sizeof(*s->nb_null_samples)); if (!s->nb_null_samples) return AVERROR(ENOMEM); - s->start = av_malloc_array(sizeof(*s->start), s->independent_channels); + s->start = av_malloc_array(s->independent_channels, sizeof(*s->start)); if (!s->start) return AVERROR(ENOMEM); for (c = 0; c < s->independent_channels; c++) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 11a0f13ac6..847199dda1 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -688,7 +688,7 @@ AVFilterFormats *ff_all_alpha_modes(void) if (!f) \ return AVERROR(ENOMEM); \ \ - tmp = av_realloc_array(f->refs, sizeof(*f->refs), f->refcount + 1); \ + tmp = av_realloc_array(f->refs, f->refcount + 1, sizeof(*f->refs)); \ if (!tmp) { \ unref_fn(&f); \ return AVERROR(ENOMEM); \ diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index 7dc27144fe..fb78e10faf 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -165,7 +165,7 @@ static int read_shape_from_file(int *cols, int *rows, int **values, const char * ret = AVERROR_INVALIDDATA; goto end; } - if (!(*values = av_calloc(sizeof(int) * *rows, *cols))) { + if (!(*values = av_calloc(*cols, sizeof(**values) * *rows))) { ret = AVERROR(ENOMEM); goto end; } diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c index 994fe1db93..9dcd0c6192 100644 --- a/libavfilter/vf_pixdesctest.c +++ b/libavfilter/vf_pixdesctest.c @@ -48,7 +48,7 @@ static int config_props(AVFilterLink *inlink) priv->pix_desc = av_pix_fmt_desc_get(inlink->format); av_freep(&priv->line); - if (!(priv->line = av_malloc_array(sizeof(*priv->line), inlink->w))) + if (!(priv->line = av_malloc_array(inlink->w, sizeof(*priv->line)))) return AVERROR(ENOMEM); return 0; diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 47f894f75f..286e13c509 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -714,7 +714,7 @@ static VkBool32 VKAPI_CALL vk_dbg_callback(VkDebugUtilsMessageSeverityFlagBitsEX #define ADD_VAL_TO_LIST(list, count, val) \ do { \ - list = av_realloc_array(list, sizeof(*list), ++count); \ + list = av_realloc_array(list, ++count, sizeof(*list)); \ if (!list) { \ err = AVERROR(ENOMEM); \ goto fail; \ diff --git a/libavutil/side_data.c b/libavutil/side_data.c index 8df117478a..bbbeb70ecd 100644 --- a/libavutil/side_data.c +++ b/libavutil/side_data.c @@ -151,7 +151,7 @@ static AVFrameSideData *add_side_data_from_buf_ext(AVFrameSideData ***sd, if ((unsigned)*nb_sd >= FFMIN(INT_MAX, SIZE_MAX)) return NULL; - tmp = av_realloc_array(*sd, sizeof(**sd), *nb_sd + 1); + tmp = av_realloc_array(*sd, *nb_sd + 1, sizeof(**sd)); if (!tmp) return NULL; *sd = tmp; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org