diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-02-21 15:11:59 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-02-21 15:11:59 +0000 |
| commit | 769c4975654407eee8c4d5ae27d7366a97bd1fda (patch) | |
| tree | 4c44e3a9d9ed102f5a9deef143d0a48e4ffb2560 | |
| parent | 4c4e746566a98340e229831624f74a5636b62b65 (diff) | |
| download | ffmpeg-769c4975654407eee8c4d5ae27d7366a97bd1fda.tar.gz | |
indent
Originally committed as revision 21940 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/bitstream.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 7549e7d8bb..a04c4a0ddf 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -159,45 +159,45 @@ static int build_table(VLC *vlc, int table_nb_bits, /* if code matches the prefix, it is in the table */ n -= n_prefix; if (n > 0) { - if(flags & INIT_VLC_LE) - code_prefix2= code & (n_prefix>=32 ? 0xffffffff : (1 << n_prefix)-1); - else - code_prefix2= code >> n; - if (code_prefix2 == code_prefix) { - if (n <= table_nb_bits) { - /* no need to add another table */ - j = (code << (table_nb_bits - n)) & (table_size - 1); - nb = 1 << (table_nb_bits - n); - for(k=0;k<nb;k++) { - if(flags & INIT_VLC_LE) - j = (code >> n_prefix) + (k<<n); + if(flags & INIT_VLC_LE) + code_prefix2= code & (n_prefix>=32 ? 0xffffffff : (1 << n_prefix)-1); + else + code_prefix2= code >> n; + if (code_prefix2 == code_prefix) { + if (n <= table_nb_bits) { + /* no need to add another table */ + j = (code << (table_nb_bits - n)) & (table_size - 1); + nb = 1 << (table_nb_bits - n); + for(k=0;k<nb;k++) { + if(flags & INIT_VLC_LE) + j = (code >> n_prefix) + (k<<n); #ifdef DEBUG_VLC - av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n", - j, i, n); + av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n", + j, i, n); #endif - if (table[j][1] /*bits*/ != 0) { - av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); - return -1; + if (table[j][1] /*bits*/ != 0) { + av_log(NULL, AV_LOG_ERROR, "incorrect codes\n"); + return -1; + } + table[j][1] = n; //bits + table[j][0] = symbol; + j++; } - table[j][1] = n; //bits - table[j][0] = symbol; - j++; - } - } else { - n -= table_nb_bits; - j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1); + } else { + n -= table_nb_bits; + j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1); #ifdef DEBUG_VLC - av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n", - j, n); + av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n", + j, n); #endif - /* compute table size */ - n1 = -table[j][1]; //bits - if (n > n1) - n1 = n; - table[j][1] = -n1; //bits + /* compute table size */ + n1 = -table[j][1]; //bits + if (n > n1) + n1 = n; + table[j][1] = -n1; //bits + } } } - } } /* second pass : fill auxillary tables recursively */ |