diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-04-13 10:15:05 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-04-13 10:15:05 +0000 |
| commit | 2bb29da60223a022c3a52d656280cfc27f1908ad (patch) | |
| tree | df76190235579aa18dc12a2b0878040ec5d4a8a9 /libavcodec | |
| parent | 69e171364eabd85c013fa58e51df21595288c473 (diff) | |
| download | ffmpeg-2bb29da60223a022c3a52d656280cfc27f1908ad.tar.gz | |
DCA: indent
Originally committed as revision 22872 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dca.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index ecd6cfb8f7..6d0b966aab 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -959,28 +959,28 @@ static int dca_subsubframe(DCAContext * s) float rscale = quant_step_size * s->scale_factor[k][l][sfi] * s->scalefactor_adj[k][sel]; if(abits >= 11 || !dca_smpl_bitalloc[abits].vlc[sel].table){ - if(abits <= 7){ - /* Block code */ - int block_code1, block_code2, size, levels; - - size = abits_sizes[abits-1]; - levels = abits_levels[abits-1]; - - block_code1 = get_bits(&s->gb, size); - /* FIXME Should test return value */ - decode_blockcode(block_code1, levels, block); - block_code2 = get_bits(&s->gb, size); - decode_blockcode(block_code2, levels, &block[4]); + if(abits <= 7){ + /* Block code */ + int block_code1, block_code2, size, levels; + + size = abits_sizes[abits-1]; + levels = abits_levels[abits-1]; + + block_code1 = get_bits(&s->gb, size); + /* FIXME Should test return value */ + decode_blockcode(block_code1, levels, block); + block_code2 = get_bits(&s->gb, size); + decode_blockcode(block_code2, levels, &block[4]); + }else{ + /* no coding */ + for (m = 0; m < 8; m++) + block[m] = get_sbits(&s->gb, abits - 3); + } }else{ - /* no coding */ + /* Huffman coded */ for (m = 0; m < 8; m++) - block[m] = get_sbits(&s->gb, abits - 3); + block[m] = get_bitalloc(&s->gb, &dca_smpl_bitalloc[abits], sel); } - }else{ - /* Huffman coded */ - for (m = 0; m < 8; m++) - block[m] = get_bitalloc(&s->gb, &dca_smpl_bitalloc[abits], sel); - } s->dsp.int32_to_float_fmul_scalar(subband_samples[k][l], block, rscale, 8); |