[FFmpeg-cvslog] r24625 - trunk/libavcodec/flacenc.c
jbr
subversion
Sat Jul 31 19:07:24 CEST 2010
Author: jbr
Date: Sat Jul 31 19:07:24 2010
New Revision: 24625
Log:
cosmetics: line wrap and vertical alignment
Modified:
trunk/libavcodec/flacenc.c
Modified: trunk/libavcodec/flacenc.c
==============================================================================
--- trunk/libavcodec/flacenc.c Sat Jul 31 19:06:10 2010 (r24624)
+++ trunk/libavcodec/flacenc.c Sat Jul 31 19:07:24 2010 (r24625)
@@ -864,8 +864,9 @@ static int encode_residual_ch(FlacEncode
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(FlacEncode
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(FlacEncode
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(FlacEncode
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);
}
More information about the ffmpeg-cvslog
mailing list