RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Reimar Döffinger 2009-09-24 15:13:34 +00:00
parent 80bc3bbc2e
commit 595324e143
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/bitstream.c
View File

@ -151,7 +151,7 @@ static int build_table(VLC *vlc, int table_nb_bits,
VLC_TYPE (*table)[2]; VLC_TYPE (*table)[2];
table_size = 1 << table_nb_bits; 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 #ifdef DEBUG_VLC
av_log(NULL,AV_LOG_DEBUG,"new table index=%d size=%d code_prefix=%x n=%d\n", 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); 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){ }else if(vlc->table_size){
abort(); // fatal error, we are called on a partially initialized table abort(); // fatal error, we are called on a partially initialized table
} }
}else if(!(flags & INIT_VLC_USE_STATIC)) { }else {
vlc->table = NULL; vlc->table = NULL;
vlc->table_allocated = 0; vlc->table_allocated = 0;
vlc->table_size = 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 #ifdef DEBUG_VLC

1
libavcodec/get_bits.h
View File

@ -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 *codes, int codes_wrap, int codes_size,
const void *symbols, int symbols_wrap, int symbols_size, const void *symbols, int symbols_wrap, int symbols_size,
int flags); int flags);
#define INIT_VLC_USE_STATIC 1 ///< VERY strongly deprecated and forbidden
#define INIT_VLC_LE 2 #define INIT_VLC_LE 2
#define INIT_VLC_USE_NEW_STATIC 4 #define INIT_VLC_USE_NEW_STATIC 4
void free_vlc(VLC *vlc); void free_vlc(VLC *vlc);