diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2010-07-31 01:07:21 +0400 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2010-07-31 01:07:21 +0400 |
commit | 724f34716b60306f5bb1aa626ea036f8b826e6c4 (patch) | |
tree | 28648559ee18a453610dc3962f26f76bdd0633da /libavcodec/flacenc.c | |
parent | 6d263f41ae46ff06d5730c3cb8c09c5eac82c262 (diff) |
cosmetics: indentation
Originally committed as revision 24609 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flacenc.c')
-rw-r--r-- | libavcodec/flacenc.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index da182f3a5a..f4e124acc0 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1114,36 +1114,36 @@ static void output_subframe(FlacEncodeContext *s, FlacSubframe *sub) while (res < frame_end) put_sbits(&s->pb, sub->obits, *res++); } else { - /* warm-up samples */ - for (i = 0; i < sub->order; i++) - put_sbits(&s->pb, sub->obits, *res++); - - /* LPC coefficients */ - if (sub->type == FLAC_SUBFRAME_LPC) { - int cbits = s->options.lpc_coeff_precision; - put_bits( &s->pb, 4, cbits-1); - put_sbits(&s->pb, 5, sub->shift); + /* warm-up samples */ for (i = 0; i < sub->order; i++) - put_sbits(&s->pb, cbits, sub->coefs[i]); - } + put_sbits(&s->pb, sub->obits, *res++); - /* rice-encoded block */ - put_bits(&s->pb, 2, 0); - - /* partition order */ - porder = sub->rc.porder; - psize = s->frame.blocksize >> porder; - put_bits(&s->pb, 4, porder); - - /* residual */ - part_end = &sub->residual[psize ]; - for (p = 0; p < 1 << porder; p++) { - int k = sub->rc.params[p]; - put_bits(&s->pb, 4, k); - while (res < part_end) - set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0); - part_end = FFMIN(frame_end, part_end + psize); - } + /* LPC coefficients */ + if (sub->type == FLAC_SUBFRAME_LPC) { + int cbits = s->options.lpc_coeff_precision; + put_bits( &s->pb, 4, cbits-1); + put_sbits(&s->pb, 5, sub->shift); + for (i = 0; i < sub->order; i++) + put_sbits(&s->pb, cbits, sub->coefs[i]); + } + + /* rice-encoded block */ + put_bits(&s->pb, 2, 0); + + /* partition order */ + porder = sub->rc.porder; + psize = s->frame.blocksize >> porder; + put_bits(&s->pb, 4, porder); + + /* residual */ + part_end = &sub->residual[psize]; + for (p = 0; p < 1 << porder; p++) { + int k = sub->rc.params[p]; + put_bits(&s->pb, 4, k); + while (res < part_end) + set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0); + part_end = FFMIN(frame_end, part_end + psize); + } } } |