diff options
| -rw-r--r-- | libavcodec/flacenc.c | 5 | ||||
| -rw-r--r-- | libavcodec/lpc.c | 7 | ||||
| -rw-r--r-- | libavcodec/lpc.h | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index ea104360c1..3e208dceb7 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -855,8 +855,9 @@ static int encode_residual(FlacEncodeContext *ctx, int ch) } /* LPC */ - opt_order = ff_lpc_calc_coefs(&ctx->dsp, smp, n, min_order, max_order, precision, coefs, - shift, ctx->options.use_lpc, omethod, MAX_LPC_SHIFT, 0); + opt_order = ff_lpc_calc_coefs(&ctx->dsp, smp, n, min_order, max_order, + precision, coefs, shift, ctx->options.use_lpc, + omethod, MAX_LPC_SHIFT, 0); if(omethod == ORDER_METHOD_2LEVEL || omethod == ORDER_METHOD_4LEVEL || diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 792abe4d1c..8c21a2c4e5 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -135,9 +135,10 @@ static int estimate_best_order(double *ref, int max_order) * Calculate LPC coefficients for multiple orders */ int ff_lpc_calc_coefs(DSPContext *s, - const int32_t *samples, int blocksize, int min_order, int max_order, - int precision, int32_t coefs[][MAX_LPC_ORDER], - int *shift, int use_lpc, int omethod, int max_shift, int zero_shift) + const int32_t *samples, int blocksize, int min_order, + int max_order, int precision, + int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc, + int omethod, int max_shift, int zero_shift) { double autoc[MAX_LPC_ORDER+1]; double ref[MAX_LPC_ORDER]; diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h index 6c7c2eba93..94eb787389 100644 --- a/libavcodec/lpc.h +++ b/libavcodec/lpc.h @@ -39,8 +39,9 @@ * Calculate LPC coefficients for multiple orders */ int ff_lpc_calc_coefs(DSPContext *s, - const int32_t *samples, int blocksize, int min_order, int max_order, - int precision, int32_t coefs[][MAX_LPC_ORDER], - int *shift, int use_lpc, int omethod, int max_shift, int zero_shift); + const int32_t *samples, int blocksize, int min_order, + int max_order, int precision, + int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc, + int omethod, int max_shift, int zero_shift); #endif /* FFMPEG_LPC_H */ |