diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-02-26 01:54:16 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-02-26 01:54:16 +0000 |
| commit | e8d5c07bccd4c85230c685c13db90266c7cd7973 (patch) | |
| tree | b252fe00e492c97c0d400653a02f19e5b0b9a11c | |
| parent | 21e8c46cde3ec929551942f0ab27427175957011 (diff) | |
| download | ffmpeg-e8d5c07bccd4c85230c685c13db90266c7cd7973.tar.gz | |
Re-indent after last commit.
Originally committed as revision 17600 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/aac.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 324c06eb27..9eb4711ffa 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -805,31 +805,31 @@ static int decode_spectrum_and_dequant(AACContext * ac, float coef[1024], GetBit if (vq_ptr[2]) coef[coef_tmp_idx + 2] = sign_lookup[get_bits1(gb)]; if (vq_ptr[3]) coef[coef_tmp_idx + 3] = sign_lookup[get_bits1(gb)]; } - if (cur_band_type == ESC_BT) { - for (j = 0; j < 2; j++) { - if (vq_ptr[j] == 64.0f) { - int n = 4; - /* The total length of escape_sequence must be < 22 bits according - to the specification (i.e. max is 11111111110xxxxxxxxxx). */ - while (get_bits1(gb) && n < 15) n++; - if(n == 15) { - av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); - return -1; - } - n = (1<<n) + get_bits(gb, n); - coef[coef_tmp_idx + j] *= cbrtf(n) * n; - }else - coef[coef_tmp_idx + j] *= vq_ptr[j]; - } - }else - { - coef[coef_tmp_idx ] *= vq_ptr[0]; - coef[coef_tmp_idx + 1] *= vq_ptr[1]; - if (dim == 4) { - coef[coef_tmp_idx + 2] *= vq_ptr[2]; - coef[coef_tmp_idx + 3] *= vq_ptr[3]; + if (cur_band_type == ESC_BT) { + for (j = 0; j < 2; j++) { + if (vq_ptr[j] == 64.0f) { + int n = 4; + /* The total length of escape_sequence must be < 22 bits according + to the specification (i.e. max is 11111111110xxxxxxxxxx). */ + while (get_bits1(gb) && n < 15) n++; + if(n == 15) { + av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); + return -1; + } + n = (1<<n) + get_bits(gb, n); + coef[coef_tmp_idx + j] *= cbrtf(n) * n; + }else + coef[coef_tmp_idx + j] *= vq_ptr[j]; + } + }else + { + coef[coef_tmp_idx ] *= vq_ptr[0]; + coef[coef_tmp_idx + 1] *= vq_ptr[1]; + if (dim == 4) { + coef[coef_tmp_idx + 2] *= vq_ptr[2]; + coef[coef_tmp_idx + 3] *= vq_ptr[3]; + } } - } }else { coef[coef_tmp_idx ] = vq_ptr[0]; coef[coef_tmp_idx + 1] = vq_ptr[1]; |