Commit 45e29087 authored by Justin Ruggles's avatar Justin Ruggles

cosmetics: line wrap and vertical alignment

Originally committed as revision 24625 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8fbb8d31
...@@ -864,8 +864,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) ...@@ -864,8 +864,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
if (order < 0) if (order < 0)
order = 0; order = 0;
encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]); encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]);
bits[i] = find_subblock_rice_params(&sub->rc, min_porder, max_porder, bits[i] = find_subblock_rice_params(&sub->rc, min_porder,
res, n, order+1, sub->obits, precision); max_porder, res, n, order+1,
sub->obits, precision);
if (bits[i] < bits[opt_index]) { if (bits[i] < bits[opt_index]) {
opt_index = i; opt_index = i;
opt_order = order; opt_order = order;
...@@ -879,8 +880,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) ...@@ -879,8 +880,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
bits[0] = UINT32_MAX; bits[0] = UINT32_MAX;
for (i = min_order-1; i < max_order; i++) { for (i = min_order-1; i < max_order; i++) {
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[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, bits[i] = find_subblock_rice_params(&sub->rc, min_porder,
res, n, i+1, sub->obits, precision); max_porder, res, n, i+1,
sub->obits, precision);
if (bits[i] < bits[opt_order]) if (bits[i] < bits[opt_order])
opt_order = i; opt_order = i;
} }
...@@ -898,9 +900,9 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) ...@@ -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) if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX)
continue; continue;
encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[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, bits[i] = find_subblock_rice_params(&sub->rc, min_porder,
res, n, i+1, sub->obits, max_porder, res, n, i+1,
precision); sub->obits, precision);
if (bits[i] < bits[opt_order]) if (bits[i] < bits[opt_order])
opt_order = i; opt_order = i;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment