Revision 0d8837bd libavcodec/flacenc.c

View differences:

libavcodec/flacenc.c
23 23
#include "libavutil/md5.h"
24 24
#include "avcodec.h"
25 25
#include "get_bits.h"
26
#include "dsputil.h"
27 26
#include "golomb.h"
28 27
#include "lpc.h"
29 28
#include "flac.h"
......
95 94
    FlacFrame frame;
96 95
    CompressionOptions options;
97 96
    AVCodecContext *avctx;
98
    DSPContext dsp;
97
    LPCContext lpc_ctx;
99 98
    struct AVMD5 *md5ctx;
100 99
} FlacEncodeContext;
101 100

  
......
217 216

  
218 217
    s->avctx = avctx;
219 218

  
220
    dsputil_init(&s->dsp, avctx);
219
    ff_lpc_init(&s->lpc_ctx);
221 220

  
222 221
    if (avctx->sample_fmt != AV_SAMPLE_FMT_S16)
223 222
        return -1;
......
902 901

  
903 902
    /* LPC */
904 903
    sub->type = FLAC_SUBFRAME_LPC;
905
    opt_order = ff_lpc_calc_coefs(&s->dsp, smp, n, min_order, max_order,
904
    opt_order = ff_lpc_calc_coefs(&s->lpc_ctx, smp, n, min_order, max_order,
906 905
                                  s->options.lpc_coeff_precision, coefs, shift, s->options.lpc_type,
907 906
                                  s->options.lpc_passes, omethod,
908 907
                                  MAX_LPC_SHIFT, 0);

Also available in: Unified diff