1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

cosmetics: line wrap and vertical alignment

Originally committed as revision 24625 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2010-07-31 17:07:24 +00:00
parent 8fbb8d31d8
commit 45e2908757

View File

@ -864,8 +864,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
if (order < 0)
order = 0;
encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]);
bits[i] = find_subblock_rice_params(&sub->rc, min_porder, max_porder,
res, n, order+1, sub->obits, precision);
bits[i] = find_subblock_rice_params(&sub->rc, min_porder,
max_porder, res, n, order+1,
sub->obits, precision);
if (bits[i] < bits[opt_index]) {
opt_index = i;
opt_order = order;
@ -879,8 +880,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
bits[0] = UINT32_MAX;
for (i = min_order-1; i < max_order; i++) {
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]);
bits[i] = find_subblock_rice_params(&sub->rc, min_porder, max_porder,
res, n, i+1, sub->obits, precision);
bits[i] = find_subblock_rice_params(&sub->rc, min_porder,
max_porder, res, n, i+1,
sub->obits, precision);
if (bits[i] < bits[opt_order])
opt_order = i;
}
@ -898,9 +900,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX)
continue;
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]);
bits[i] = find_subblock_rice_params(&sub->rc, min_porder, max_porder,
res, n, i+1, sub->obits,
precision);
bits[i] = find_subblock_rice_params(&sub->rc, min_porder,
max_porder, res, n, i+1,
sub->obits, precision);
if (bits[i] < bits[opt_order])
opt_order = i;
}
@ -918,7 +920,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift);
return find_subblock_rice_params(&sub->rc, min_porder, max_porder, res, n,
sub->order, sub->obits, precision);
sub->order, sub->obits, precision);
}