From fbe8672e158a640291c964eef51cbb2924af6348 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 12 Jan 2015 23:27:18 +0100 Subject: [PATCH] avcodec/shorten: use av_reallocp_array() Signed-off-by: Michael Niedermayer --- libavcodec/shorten.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 4c9cc0636c..deae0fa1ce 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -136,12 +136,12 @@ static int allocate_buffers(ShortenContext *s) return AVERROR_INVALIDDATA; } - if ((err = av_reallocp(&s->offset[chan], - sizeof(int32_t) * + if ((err = av_reallocp_array(&s->offset[chan], + sizeof(int32_t), FFMAX(1, s->nmean))) < 0) return err; - if ((err = av_reallocp(&s->decoded_base[chan], (s->blocksize + s->nwrap) * + if ((err = av_reallocp_array(&s->decoded_base[chan], (s->blocksize + s->nwrap), sizeof(s->decoded_base[0][0]))) < 0) return err; for (i = 0; i < s->nwrap; i++) @@ -149,7 +149,7 @@ static int allocate_buffers(ShortenContext *s) s->decoded[chan] = s->decoded_base[chan] + s->nwrap; } - if ((err = av_reallocp(&s->coeffs, s->nwrap * sizeof(*s->coeffs))) < 0) + if ((err = av_reallocp_array(&s->coeffs, s->nwrap, sizeof(*s->coeffs))) < 0) return err; return 0;