diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-12 07:40:37 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-12 07:40:37 +0400 |
commit | fb4ac46d7f51cee2244e909de1c2432bdb95c08b (patch) | |
tree | ea7f3360ecd0c4aceafe1f9966b79fedadd6e44f /libavcodec | |
parent | 46375e9a97c62f153bd553715c6eab73e77f7795 (diff) |
avcodec/elbg: Use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/elbg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index 11b541f210..9bbb6d88ac 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -343,7 +343,7 @@ void avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook, if (numpoints > 24*numCB) { /* ELBG is very costly for a big number of points. So if we have a lot of them, get a good initial codebook to save on iterations */ - int *temp_points = av_malloc(dim*(numpoints/8)*sizeof(int)); + int *temp_points = av_malloc_array(dim, (numpoints/8)*sizeof(int)); for (i=0; i<numpoints/8; i++) { k = (i*BIG_PRIME) % numpoints; memcpy(temp_points + i*dim, points + k*dim, dim*sizeof(int)); @@ -369,9 +369,9 @@ void avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook, elbg_data elbg_d; elbg_data *elbg = &elbg_d; int i, j, k, last_error, steps=0; - int *dist_cb = av_malloc(numpoints*sizeof(int)); - int *size_part = av_malloc(numCB*sizeof(int)); - cell *list_buffer = av_malloc(numpoints*sizeof(cell)); + int *dist_cb = av_malloc_array(numpoints, sizeof(int)); + int *size_part = av_malloc_array(numCB, sizeof(int)); + cell *list_buffer = av_malloc_array(numpoints, sizeof(cell)); cell *free_cells; int best_dist, best_idx = 0; @@ -379,12 +379,12 @@ void avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook, elbg->dim = dim; elbg->numCB = numCB; elbg->codebook = codebook; - elbg->cells = av_malloc(numCB*sizeof(cell *)); - elbg->utility = av_malloc(numCB*sizeof(int)); + elbg->cells = av_malloc_array(numCB, sizeof(cell *)); + elbg->utility = av_malloc_array(numCB, sizeof(int)); elbg->nearest_cb = closest_cb; elbg->points = points; - elbg->utility_inc = av_malloc(numCB*sizeof(*elbg->utility_inc)); - elbg->scratchbuf = av_malloc(5*dim*sizeof(int)); + elbg->utility_inc = av_malloc_array(numCB, sizeof(*elbg->utility_inc)); + elbg->scratchbuf = av_malloc_array(5*dim, sizeof(int)); elbg->rand_state = rand_state; |