[FFmpeg-cvslog] avcodec/resample2: Use av_malloc(z)_array()
Michael Niedermayer
git at videolan.org
Thu Jul 17 18:05:22 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 17 16:32:48 2014 +0200| [ad516dd271ff4557c441895ca8cb16a182c064e9] | committer: Michael Niedermayer
avcodec/resample2: Use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad516dd271ff4557c441895ca8cb16a182c064e9
---
libavcodec/resample2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index 9b63b53..cd9fe1c 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -102,7 +102,7 @@ static double bessel(double x){
static int build_filter(FELEM *filter, double factor, int tap_count, int phase_count, int scale, int type){
int ph, i;
double x, y, w;
- double *tab = av_malloc(tap_count * sizeof(*tab));
+ double *tab = av_malloc_array(tap_count, sizeof(*tab));
const int center= (tap_count-1)/2;
if (!tab)
@@ -202,7 +202,7 @@ AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size,
c->linear= linear;
c->filter_length= FFMAX((int)ceil(filter_size/factor), 1);
- c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM));
+ c->filter_bank= av_mallocz_array(c->filter_length, (phase_count+1)*sizeof(FELEM));
if (!c->filter_bank)
goto error;
if (build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE))
More information about the ffmpeg-cvslog
mailing list