Revision c73d99e6 libavcodec/ac3dec.c

View differences:

libavcodec/ac3dec.c
193 193
    ff_mdct_init(&s->imdct_512, 9, 1, 1.0);
194 194
    ff_kbd_window_init(s->window, 5.0, 256);
195 195
    dsputil_init(&s->dsp, avctx);
196
    ff_fmt_convert_init(&s->fmt_conv, avctx);
196 197
    av_lfg_init(&s->dith_state, 0);
197 198

  
198 199
    /* set scale value for float to int16 conversion */
......
1255 1256
        } else {
1256 1257
            gain *= s->dynamic_range[0];
1257 1258
        }
1258
        s->dsp.int32_to_float_fmul_scalar(s->transform_coeffs[ch], s->fixed_coeffs[ch], gain, 256);
1259
        s->fmt_conv.int32_to_float_fmul_scalar(s->transform_coeffs[ch], s->fixed_coeffs[ch], gain, 256);
1259 1260
    }
1260 1261

  
1261 1262
    /* apply spectral extension to high frequency bins */
......
1407 1408
            av_log(avctx, AV_LOG_ERROR, "error decoding the audio block\n");
1408 1409
            err = 1;
1409 1410
        }
1410
        s->dsp.float_to_int16_interleave(out_samples, output, 256, s->out_channels);
1411
        s->fmt_conv.float_to_int16_interleave(out_samples, output, 256, s->out_channels);
1411 1412
        out_samples += 256 * s->out_channels;
1412 1413
    }
1413 1414
    *data_size = s->num_blocks * 256 * avctx->channels * sizeof (int16_t);

Also available in: Unified diff