diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-09 10:05:30 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-09 10:15:56 +0100 |
commit | 48ffaaaaef98640782cfdaaf21319a83292b62b2 (patch) | |
tree | 4c55898e390084daa900b4e7b9535b711620bd67 /libswresample | |
parent | d80fe5d4bce3503390513ab7b7dbc634cacade40 (diff) | |
download | ffmpeg-48ffaaaaef98640782cfdaaf21319a83292b62b2.tar.gz |
swresample/x86/rematrix_init: Use av_mallocz_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
-rw-r--r-- | libswresample/x86/rematrix_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/x86/rematrix_init.c b/libswresample/x86/rematrix_init.c index e2ee29189f..bf695747cd 100644 --- a/libswresample/x86/rematrix_init.c +++ b/libswresample/x86/rematrix_init.c @@ -50,7 +50,7 @@ av_cold void 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(2 * num * sizeof(int16_t)); + s->native_simd_matrix = av_mallocz_array(num, 2 * sizeof(int16_t)); s->native_simd_one = av_mallocz(2 * sizeof(int16_t)); for(i=0; i<nb_out; i++){ int sh = 0; @@ -74,7 +74,7 @@ av_cold void 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(num * sizeof(float)); + s->native_simd_matrix = av_mallocz_array(num, sizeof(float)); memcpy(s->native_simd_matrix, s->native_matrix, num * sizeof(float)); s->native_simd_one = av_mallocz(sizeof(float)); memcpy(s->native_simd_one, s->native_one, sizeof(float)); |