Mercurial > libavcodec.hg
changeset 10263:fd9dfd5aa5e9 libavcodec
Completely remove INIT_VLC_USE_STATIC, it is deprecated since ages and
finally no longer used anywhere.
| author | reimar |
|---|---|
| date | Thu, 24 Sep 2009 15:13:34 +0000 |
| parents | 0eed6587903b |
| children | f9efc2bd005d |
| files | bitstream.c get_bits.h |
| diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/bitstream.c Thu Sep 24 15:12:05 2009 +0000 +++ b/bitstream.c Thu Sep 24 15:13:34 2009 +0000 @@ -151,7 +151,7 @@ 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 @@ }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
--- a/get_bits.h Thu Sep 24 15:12:05 2009 +0000 +++ b/get_bits.h Thu Sep 24 15:13:34 2009 +0000 @@ -538,7 +538,6 @@ 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);