diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-14 21:31:53 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-20 01:03:52 +0200 |
| commit | 1ea365082318f06cd42a8b37dd0c7724b599c821 (patch) | |
| tree | 4df48a8b9f4614803fd2a88c29ad2ff7f7070294 /libswresample | |
| parent | 4b154743163ffbe3fdc50759c0c55dc854636488 (diff) | |
| download | ffmpeg-1ea365082318f06cd42a8b37dd0c7724b599c821.tar.gz | |
Replace all occurences of av_mallocz_array() by av_calloc()
They do the same.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/swresample.c | 2 | ||||
| -rw-r--r-- | libswresample/x86/rematrix_init.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index a7bb69dd4f..22c2c33673 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -415,7 +415,7 @@ int swri_realloc_audio(AudioData *a, int count){ av_assert0(a->bps); av_assert0(a->ch_count); - a->data= av_mallocz_array(countb, a->ch_count); + a->data = av_calloc(countb, a->ch_count); if(!a->data) return AVERROR(ENOMEM); for(i=0; i<a->ch_count; i++){ diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c index e515e4bcff..0608c74e7f 100644 --- a/libswresample/x86/rematrix_init.c +++ b/libswresample/x86/rematrix_init.c @@ -51,7 +51,7 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){ s->mix_1_1_simd = ff_mix_1_1_a_int16_sse2; s->mix_2_1_simd = ff_mix_2_1_a_int16_sse2; } - s->native_simd_matrix = av_mallocz_array(num, 2 * sizeof(int16_t)); + s->native_simd_matrix = av_calloc(num, 2 * sizeof(int16_t)); s->native_simd_one = av_mallocz(2 * sizeof(int16_t)); if (!s->native_simd_matrix || !s->native_simd_one) return AVERROR(ENOMEM); @@ -78,7 +78,7 @@ av_cold int swri_rematrix_init_x86(struct SwrContext *s){ s->mix_1_1_simd = ff_mix_1_1_a_float_avx; s->mix_2_1_simd = ff_mix_2_1_a_float_avx; } - s->native_simd_matrix = av_mallocz_array(num, sizeof(float)); + s->native_simd_matrix = av_calloc(num, sizeof(float)); s->native_simd_one = av_mallocz(sizeof(float)); if (!s->native_simd_matrix || !s->native_simd_one) return AVERROR(ENOMEM); |