virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/snow: use av_malloc(z)_array()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-18 15:22:29 +02:00
parent bb0d9aedcb
commit 71f8cdcc16
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/snow.c
View File

@ -88,7 +88,7 @@ int ff_snow_alloc_blocks(SnowContext *s){
s->b_height= h; s->b_height= h;
av_free(s->block); av_free(s->block);
s->block= av_mallocz(w * h * sizeof(BlockNode) << (s->block_max_depth*2)); s->block= av_mallocz_array(w * h, sizeof(BlockNode) << (s->block_max_depth*2));
if (!s->block) if (!s->block)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -537,7 +537,7 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) {
b->parent= &s->plane[plane_index].band[level-1][orientation]; b->parent= &s->plane[plane_index].band[level-1][orientation];
//FIXME avoid this realloc //FIXME avoid this realloc
av_freep(&b->x_coeff); av_freep(&b->x_coeff);
b->x_coeff=av_mallocz(((b->width+1) * b->height+1)*sizeof(x_and_coeff)); b->x_coeff=av_mallocz_array(((b->width+1) * b->height+1), sizeof(x_and_coeff));
if (!b->x_coeff) if (!b->x_coeff)
goto fail; goto fail;
} }