RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/elbg: Use av_malloc(z)_array() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-12 05:40:37 +02:00
parent 46375e9a97
commit fb4ac46d7f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/elbg.c
View File

@ -343,7 +343,7 @@ void avpriv_init_elbg(int *points, int dim, int numpoints, int *codebook,
if (numpoints > 24*numCB) { if (numpoints > 24*numCB) {
/* ELBG is very costly for a big number of points. So if we have a lot /* 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 */ 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++) { for (i=0; i<numpoints/8; i++) {
k = (i*BIG_PRIME) % numpoints; k = (i*BIG_PRIME) % numpoints;
memcpy(temp_points + i*dim, points + k*dim, dim*sizeof(int)); 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_d;
elbg_data *elbg = &elbg_d; elbg_data *elbg = &elbg_d;
int i, j, k, last_error, steps=0; int i, j, k, last_error, steps=0;
int *dist_cb = av_malloc(numpoints*sizeof(int)); int *dist_cb = av_malloc_array(numpoints, sizeof(int));
int *size_part = av_malloc(numCB*sizeof(int)); int *size_part = av_malloc_array(numCB, sizeof(int));
cell *list_buffer = av_malloc(numpoints*sizeof(cell)); cell *list_buffer = av_malloc_array(numpoints, sizeof(cell));
cell *free_cells; cell *free_cells;
int best_dist, best_idx = 0; 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->dim = dim;
elbg->numCB = numCB; elbg->numCB = numCB;
elbg->codebook = codebook; elbg->codebook = codebook;
elbg->cells = av_malloc(numCB*sizeof(cell *)); elbg->cells = av_malloc_array(numCB, sizeof(cell *));
elbg->utility = av_malloc(numCB*sizeof(int)); elbg->utility = av_malloc_array(numCB, sizeof(int));
elbg->nearest_cb = closest_cb; elbg->nearest_cb = closest_cb;
elbg->points = points; elbg->points = points;
elbg->utility_inc = av_malloc(numCB*sizeof(*elbg->utility_inc)); elbg->utility_inc = av_malloc_array(numCB, sizeof(*elbg->utility_inc));
elbg->scratchbuf = av_malloc(5*dim*sizeof(int)); elbg->scratchbuf = av_malloc_array(5*dim, sizeof(int));
elbg->rand_state = rand_state; elbg->rand_state = rand_state;