summaryrefslogtreecommitdiff
path: root/libavcodec/flacenc.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2010-07-31 17:07:24 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2010-07-31 17:07:24 +0000
commit45e29087573916ab327265d9c23caca461315082 (patch)
tree5d39d6cacb0cd7e37f50e1847741328587e71d20 /libavcodec/flacenc.c
parent8fbb8d31d89e716f519e815feb68fa3f2f88df67 (diff)
downloadffmpeg-45e29087573916ab327265d9c23caca461315082.tar.gz
cosmetics: line wrap and vertical alignment
Originally committed as revision 24625 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flacenc.c')
-rw-r--r--libavcodec/flacenc.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index bc32bce2a6..d5a9a16c94 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -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);
}