diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2008-08-31 02:32:08 +0000 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2008-08-31 02:32:08 +0000 |
commit | f2e4eb62dc77997cfdbd82a454cf0c403886613f (patch) | |
tree | ab0636d5460d9dae8b73b60d1290ee1d7d93542f /libavcodec/ac3dec.c | |
parent | 5d2dd908484d062bdb7ebe31c4fcf4584cac8168 (diff) | |
download | ffmpeg-streaming-f2e4eb62dc77997cfdbd82a454cf0c403886613f.zip ffmpeg-streaming-f2e4eb62dc77997cfdbd82a454cf0c403886613f.tar.gz |
cosmetics: indentation
Originally committed as revision 15089 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3dec.c')
-rw-r--r-- | libavcodec/ac3dec.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 0375c6f..f51e2a8 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -966,31 +966,31 @@ static int decode_audio_block(AC3DecodeContext *s, int blk) /* signal-to-noise ratio offsets and fast gains (signal-to-mask ratios) */ if(!s->eac3 || !blk){ if(s->snr_offset_strategy && get_bits1(gbc)) { - int snr = 0; - int csnr; - csnr = (get_bits(gbc, 6) - 15) << 4; - for (i = ch = !cpl_in_use; ch <= s->channels; ch++) { - /* snr offset */ - if (ch == i || s->snr_offset_strategy == 2) - snr = (csnr + get_bits(gbc, 4)) << 2; - /* run at least last bit allocation stage if snr offset changes */ - if(blk && s->snr_offset[ch] != snr) { - bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 1); - } - s->snr_offset[ch] = snr; + int snr = 0; + int csnr; + csnr = (get_bits(gbc, 6) - 15) << 4; + for (i = ch = !cpl_in_use; ch <= s->channels; ch++) { + /* snr offset */ + if (ch == i || s->snr_offset_strategy == 2) + snr = (csnr + get_bits(gbc, 4)) << 2; + /* run at least last bit allocation stage if snr offset changes */ + if(blk && s->snr_offset[ch] != snr) { + bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 1); + } + s->snr_offset[ch] = snr; /* fast gain (normal AC-3 only) */ if (!s->eac3) { int prev = s->fast_gain[ch]; - s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)]; + s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)]; /* run last 2 bit allocation stages if fast gain changes */ if(blk && prev != s->fast_gain[ch]) bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); - } } + } } else if (!s->eac3 && !blk) { - av_log(s->avctx, AV_LOG_ERROR, "new snr offsets must be present in block 0\n"); - return -1; + av_log(s->avctx, AV_LOG_ERROR, "new snr offsets must be present in block 0\n"); + return -1; } } @@ -1022,7 +1022,7 @@ static int decode_audio_block(AC3DecodeContext *s, int blk) coupling leak changes */ if(blk && (fl != s->bit_alloc_params.cpl_fast_leak || sl != s->bit_alloc_params.cpl_slow_leak)) { - bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2); + bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2); } s->bit_alloc_params.cpl_fast_leak = fl; s->bit_alloc_params.cpl_slow_leak = sl; |