Revision 9045f5e7

View differences:

libavcodec/flacenc.c
855 855
    }
856 856

  
857 857
    /* LPC */
858
    opt_order = ff_lpc_calc_coefs(&ctx->dsp, smp, n, min_order, max_order, precision, coefs,
859
                               shift, ctx->options.use_lpc, omethod, MAX_LPC_SHIFT, 0);
858
    opt_order = ff_lpc_calc_coefs(&ctx->dsp, smp, n, min_order, max_order,
859
                                  precision, coefs, shift, ctx->options.use_lpc,
860
                                  omethod, MAX_LPC_SHIFT, 0);
860 861

  
861 862
    if(omethod == ORDER_METHOD_2LEVEL ||
862 863
       omethod == ORDER_METHOD_4LEVEL ||
libavcodec/lpc.c
135 135
 * Calculate LPC coefficients for multiple orders
136 136
 */
137 137
int ff_lpc_calc_coefs(DSPContext *s,
138
                      const int32_t *samples, int blocksize, int min_order, int max_order,
139
                      int precision, int32_t coefs[][MAX_LPC_ORDER],
140
                      int *shift, int use_lpc, int omethod, int max_shift, int zero_shift)
138
                      const int32_t *samples, int blocksize, int min_order,
139
                      int max_order, int precision,
140
                      int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc,
141
                      int omethod, int max_shift, int zero_shift)
141 142
{
142 143
    double autoc[MAX_LPC_ORDER+1];
143 144
    double ref[MAX_LPC_ORDER];
libavcodec/lpc.h
39 39
 * Calculate LPC coefficients for multiple orders
40 40
 */
41 41
int ff_lpc_calc_coefs(DSPContext *s,
42
                      const int32_t *samples, int blocksize, int min_order, int max_order,
43
                      int precision, int32_t coefs[][MAX_LPC_ORDER],
44
                      int *shift, int use_lpc, int omethod, int max_shift, int zero_shift);
42
                      const int32_t *samples, int blocksize, int min_order,
43
                      int max_order, int precision,
44
                      int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc,
45
                      int omethod, int max_shift, int zero_shift);
45 46

  
46 47
#endif /* FFMPEG_LPC_H */

Also available in: Unified diff