| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-15 18:27:24 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-15 18:31:06 (GMT) |
| commit | 6e29f39252b925344c5947f1f0000e7d3eb2117f (patch) | |
| tree | 3dadfdc694e298d017e13f23219b484cd7e8d1bb | |
| parent | 8a11114a790833f83e9e5aa3e7726aa96297df78 (diff) | |
| download | ffmpeg-6e29f39252b925344c5947f1f0000e7d3eb2117f.zip ffmpeg-6e29f39252b925344c5947f1f0000e7d3eb2117f.tar.gz ffmpeg-6e29f39252b925344c5947f1f0000e7d3eb2117f.tar.bz2 | |
swr/rematrix: use av_calloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswresample/rematrix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 51658ce..84c55ee 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -337,7 +337,7 @@ av_cold int swri_rematrix_init(SwrContext *s){ return r; } if (s->midbuf.fmt == AV_SAMPLE_FMT_S16P){ - s->native_matrix = av_mallocz(nb_in * nb_out * sizeof(int)); + s->native_matrix = av_calloc(nb_in * nb_out, sizeof(int)); s->native_one = av_mallocz(sizeof(int)); for (i = 0; i < nb_out; i++) for (j = 0; j < nb_in; j++) @@ -347,7 +347,7 @@ av_cold int swri_rematrix_init(SwrContext *s){ s->mix_2_1_f = (mix_2_1_func_type*)sum2_s16; s->mix_any_f = (mix_any_func_type*)get_mix_any_func_s16(s); }else if(s->midbuf.fmt == AV_SAMPLE_FMT_FLTP){ - s->native_matrix = av_mallocz(nb_in * nb_out * sizeof(float)); + s->native_matrix = av_calloc(nb_in * nb_out, sizeof(float)); s->native_one = av_mallocz(sizeof(float)); for (i = 0; i < nb_out; i++) for (j = 0; j < nb_in; j++) @@ -357,7 +357,7 @@ av_cold int swri_rematrix_init(SwrContext *s){ s->mix_2_1_f = (mix_2_1_func_type*)sum2_float; s->mix_any_f = (mix_any_func_type*)get_mix_any_func_float(s); }else if(s->midbuf.fmt == AV_SAMPLE_FMT_DBLP){ - s->native_matrix = av_mallocz(nb_in * nb_out * sizeof(double)); + s->native_matrix = av_calloc(nb_in * nb_out, sizeof(double)); s->native_one = av_mallocz(sizeof(double)); for (i = 0; i < nb_out; i++) for (j = 0; j < nb_in; j++) |