diff options
| author | Alexander Strasser <eclipse7@gmx.net> | 2011-02-08 00:07:47 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-10 21:34:29 -0500 |
| commit | 07f06540f6ea8de14a750ef7ef58498ccc3cc58e (patch) | |
| tree | 7068ed2acc8a8b94d8b994c24a10a1843d8ed85d | |
| parent | f3d09d44b70492022964e2ead5f439bb7c96eaa2 (diff) | |
| download | ffmpeg-07f06540f6ea8de14a750ef7ef58498ccc3cc58e.tar.gz | |
vorbis dec: Delete useless scopes, and reindent after scope deletion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavcodec/vorbis_dec.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c index bca56ba663..578ffb84a6 100644 --- a/libavcodec/vorbis_dec.c +++ b/libavcodec/vorbis_dec.c @@ -594,16 +594,13 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) create_map(vc, i); - /* allocate mem for lsp coefficients */ - { - /* codebook dim is for padding if codebook dim doesn't * - * divide order+1 then we need to read more data */ - floor_setup->data.t0.lsp = - av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim) - * sizeof(float)); - if (!floor_setup->data.t0.lsp) - return -1; - } + /* codebook dim is for padding if codebook dim doesn't * + * divide order+1 then we need to read more data */ + floor_setup->data.t0.lsp = + av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim) + * sizeof(float)); + if (!floor_setup->data.t0.lsp) + return -1; #ifdef V_DEBUG /* debug output parsed headers */ AV_DEBUG("floor0 order: %u\n", floor_setup->data.t0.order); @@ -1110,11 +1107,9 @@ static int vorbis_floor0_decode(vorbis_context *vc, } /* calculate linear floor value */ - { - q = exp((((amplitude*vf->amplitude_offset) / - (((1 << vf->amplitude_bits) - 1) * sqrt(p + q))) - - vf->amplitude_offset) * .11512925f); - } + q = exp((((amplitude*vf->amplitude_offset) / + (((1 << vf->amplitude_bits) - 1) * sqrt(p + q))) + - vf->amplitude_offset) * .11512925f); /* fill vector */ do { |