diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-09-24 15:13:34 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-09-24 15:13:34 +0000 |
| commit | 595324e143b57a52e2329eb47b84395c70f93087 (patch) | |
| tree | 939f3cd55b8e453866b4eacea1f14dfc35388888 | |
| parent | 80bc3bbc2ee4fa8a57c47b6d39e74f9e27d643ce (diff) | |
| download | ffmpeg-595324e143b57a52e2329eb47b84395c70f93087.tar.gz | |
Completely remove INIT_VLC_USE_STATIC, it is deprecated since ages and
finally no longer used anywhere.
Originally committed as revision 20013 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/bitstream.c | 9 | ||||
| -rw-r--r-- | libavcodec/get_bits.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 3706f43124..689f3fdef5 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -151,7 +151,7 @@ static int build_table(VLC *vlc, int table_nb_bits, VLC_TYPE (*table)[2]; table_size = 1 << table_nb_bits; - table_index = alloc_table(vlc, table_size, flags & (INIT_VLC_USE_STATIC|INIT_VLC_USE_NEW_STATIC)); + table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_NEW_STATIC); #ifdef DEBUG_VLC av_log(NULL,AV_LOG_DEBUG,"new table index=%d size=%d code_prefix=%x n=%d\n", table_index, table_size, code_prefix, n_prefix); @@ -286,15 +286,10 @@ int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, }else if(vlc->table_size){ abort(); // fatal error, we are called on a partially initialized table } - }else if(!(flags & INIT_VLC_USE_STATIC)) { + }else { vlc->table = NULL; vlc->table_allocated = 0; vlc->table_size = 0; - } else { - /* Static tables are initially always NULL, return - if vlc->table != NULL to avoid double allocation */ - if(vlc->table) - return 0; } #ifdef DEBUG_VLC diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index c638ca1e0c..0a3ffae25f 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -538,7 +538,6 @@ int init_vlc_sparse(VLC *vlc, int nb_bits, int nb_codes, const void *codes, int codes_wrap, int codes_size, const void *symbols, int symbols_wrap, int symbols_size, int flags); -#define INIT_VLC_USE_STATIC 1 ///< VERY strongly deprecated and forbidden #define INIT_VLC_LE 2 #define INIT_VLC_USE_NEW_STATIC 4 void free_vlc(VLC *vlc); |