RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-14 19:31:24 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/ff_init_vlc_sparse: use a local array for static vlcs avoiding malloc()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-13 13:33:49 +02:00
parent 6af8326354
commit f80ccf074a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/bitstream.c
View File

@ -270,6 +270,7 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
{ {
VLCcode *buf; VLCcode *buf;
int i, j, ret; int i, j, ret;
VLCcode localbuf[1500]; // the maximum currently needed is 1296 by rv34
void *state; void *state;
vlc->bits = nb_bits; vlc->bits = nb_bits;
@ -281,17 +282,18 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
} }
} }
av_assert0(!vlc->table_size); av_assert0(!vlc->table_size);
av_assert0(nb_codes + 1 <= FF_ARRAY_ELEMS(localbuf));
buf = localbuf;
} else { } else {
vlc->table = NULL; vlc->table = NULL;
vlc->table_allocated = 0; vlc->table_allocated = 0;
vlc->table_size = 0; vlc->table_size = 0;
buf = av_malloc((nb_codes + 1) * sizeof(VLCcode));
if (!buf)
return AVERROR(ENOMEM);
} }
av_dlog(NULL, "build table nb_codes=%d\n", nb_codes);
buf = av_malloc((nb_codes + 1) * sizeof(VLCcode));
if (!buf)
return AVERROR(ENOMEM);
av_assert0(symbols_size <= 2 || !symbols); av_assert0(symbols_size <= 2 || !symbols);
j = 0; j = 0;
@ -329,7 +331,6 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
ret = build_table(vlc, nb_bits, nb_codes, buf, flags); ret = build_table(vlc, nb_bits, nb_codes, buf, flags);
av_free(buf);
if (flags & INIT_VLC_USE_NEW_STATIC) { if (flags & INIT_VLC_USE_NEW_STATIC) {
if(vlc->table_size != vlc->table_allocated) if(vlc->table_size != vlc->table_allocated)
av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated); av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated);
@ -337,6 +338,7 @@ int ff_init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes,
av_assert0(state == vlc); av_assert0(state == vlc);
av_assert0(ret >= 0); av_assert0(ret >= 0);
} else { } else {
av_free(buf);
if (ret < 0) { if (ret < 0) {
av_freep(&vlc->table); av_freep(&vlc->table);
return ret; return ret;