Module: ffmpeg Branch: master Commit: 07f06540f6ea8de14a750ef7ef58498ccc3cc58e
Author: Alexander Strasser <[email protected]> Date: Tue Feb 8 00:07:47 2011 +0100 vorbis dec: Delete useless scopes, and reindent after scope deletion Signed-off-by: Michael Niedermayer <[email protected]> Signed-off-by: Ronald S. Bultje <[email protected]> --- 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 bca56ba..578ffb8 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 { _______________________________________________ ffmpeg-commits mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-commits
