From 0674da997abe1b6c37564ecae88646ac62e43a0d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 27 May 2014 20:15:31 +0200 Subject: avcodec/cavs: use av_mallocz_array() Signed-off-by: Michael Niedermayer --- libavcodec/cavs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libavcodec/cavs.c') diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 888f38ba68..4e252c2ab0 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -742,16 +742,16 @@ void ff_cavs_init_top_lines(AVSContext *h) { /* alloc top line of predictors */ h->top_qp = av_mallocz(h->mb_width); - h->top_mv[0] = av_mallocz((h->mb_width * 2 + 1) * sizeof(cavs_vector)); - h->top_mv[1] = av_mallocz((h->mb_width * 2 + 1) * sizeof(cavs_vector)); - h->top_pred_Y = av_mallocz(h->mb_width * 2 * sizeof(*h->top_pred_Y)); - h->top_border_y = av_mallocz((h->mb_width + 1) * 16); - h->top_border_u = av_mallocz(h->mb_width * 10); - h->top_border_v = av_mallocz(h->mb_width * 10); + h->top_mv[0] = av_mallocz_array(h->mb_width * 2 + 1, sizeof(cavs_vector)); + h->top_mv[1] = av_mallocz_array(h->mb_width * 2 + 1, sizeof(cavs_vector)); + h->top_pred_Y = av_mallocz_array(h->mb_width * 2, sizeof(*h->top_pred_Y)); + h->top_border_y = av_mallocz_array(h->mb_width + 1, 16); + h->top_border_u = av_mallocz_array(h->mb_width, 10); + h->top_border_v = av_mallocz_array(h->mb_width, 10); /* alloc space for co-located MVs and types */ - h->col_mv = av_mallocz(h->mb_width * h->mb_height * 4 * - sizeof(cavs_vector)); + h->col_mv = av_mallocz_array(h->mb_width * h->mb_height, + 4 * sizeof(cavs_vector)); h->col_type_base = av_mallocz(h->mb_width * h->mb_height); h->block = av_mallocz(64 * sizeof(int16_t)); } -- cgit v1.2.3