Revision 0d8837bd libavcodec/alacenc.c

View differences:

libavcodec/alacenc.c
51 51
    int rice_modifier;
52 52
} RiceContext;
53 53

  
54
typedef struct LPCContext {
54
typedef struct AlacLPCContext {
55 55
    int lpc_order;
56 56
    int lpc_coeff[ALAC_MAX_LPC_ORDER+1];
57 57
    int lpc_quant;
58
} LPCContext;
58
} AlacLPCContext;
59 59

  
60 60
typedef struct AlacEncodeContext {
61 61
    int compression_level;
......
69 69
    int interlacing_leftweight;
70 70
    PutBitContext pbctx;
71 71
    RiceContext rc;
72
    LPCContext lpc[MAX_CHANNELS];
73
    DSPContext dspctx;
72
    AlacLPCContext lpc[MAX_CHANNELS];
73
    LPCContext lpc_ctx;
74 74
    AVCodecContext *avctx;
75 75
} AlacEncodeContext;
76 76

  
......
141 141
        s->lpc[ch].lpc_coeff[4] =   80;
142 142
        s->lpc[ch].lpc_coeff[5] =  -25;
143 143
    } else {
144
        opt_order = ff_lpc_calc_coefs(&s->dspctx, s->sample_buf[ch],
144
        opt_order = ff_lpc_calc_coefs(&s->lpc_ctx, s->sample_buf[ch],
145 145
                                      s->avctx->frame_size,
146 146
                                      s->min_prediction_order,
147 147
                                      s->max_prediction_order,
......
237 237
static void alac_linear_predictor(AlacEncodeContext *s, int ch)
238 238
{
239 239
    int i;
240
    LPCContext lpc = s->lpc[ch];
240
    AlacLPCContext lpc = s->lpc[ch];
241 241

  
242 242
    if(lpc.lpc_order == 31) {
243 243
        s->predictor_buf[0] = s->sample_buf[ch][0];
......
455 455
    avctx->coded_frame->key_frame = 1;
456 456

  
457 457
    s->avctx = avctx;
458
    dsputil_init(&s->dspctx, avctx);
458
    ff_lpc_init(&s->lpc_ctx);
459 459

  
460 460
    return 0;
461 461
}

Also available in: Unified diff