summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-09-24 22:36:52 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-09-24 22:36:52 +0000
commite518a49f34a9dcf051953cff67790152f86ba886 (patch)
tree30484ab1d5025f900baff64e538babe751e6e3c2 /libavcodec
parentf49bcde63b37d96d77f98f75c11481c243dbbf53 (diff)
downloadffmpeg-streaming-e518a49f34a9dcf051953cff67790152f86ba886.zip
ffmpeg-streaming-e518a49f34a9dcf051953cff67790152f86ba886.tar.gz
Remove a piece of code left-over from the removed alloc'd static vlc table code.
Originally committed as revision 20021 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/bitstream.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 689f3fd..cb0c0f6 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -124,13 +124,9 @@ static int alloc_table(VLC *vlc, int size, int use_static)
index = vlc->table_size;
vlc->table_size += size;
if (vlc->table_size > vlc->table_allocated) {
- if(use_static>1)
+ if(use_static)
abort(); //cant do anything, init_vlc() is used with too little memory
vlc->table_allocated += (1 << vlc->bits);
- if(use_static)
- vlc->table = ff_realloc_static(vlc->table,
- sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
- else
vlc->table = av_realloc(vlc->table,
sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
if (!vlc->table)
OpenPOWER on IntegriCloud