Revision c73d99e6 libavcodec/binkaudio.c

View differences:

libavcodec/binkaudio.c
33 33
#include "get_bits.h"
34 34
#include "dsputil.h"
35 35
#include "fft.h"
36
#include "fmtconvert.h"
36 37

  
37 38
extern const uint16_t ff_wma_critical_freqs[25];
38 39

  
......
43 44
    AVCodecContext *avctx;
44 45
    GetBitContext gb;
45 46
    DSPContext dsp;
47
    FmtConvertContext fmt_conv;
46 48
    int first;
47 49
    int channels;
48 50
    int frame_len;          ///< transform size (samples)
......
71 73

  
72 74
    s->avctx = avctx;
73 75
    dsputil_init(&s->dsp, avctx);
76
    ff_fmt_convert_init(&s->fmt_conv, avctx);
74 77

  
75 78
    /* determine frame length */
76 79
    if (avctx->sample_rate < 22050) {
......
222 225
            ff_rdft_calc(&s->trans.rdft, coeffs);
223 226
    }
224 227

  
225
    s->dsp.float_to_int16_interleave(out, (const float **)s->coeffs_ptr, s->frame_len, s->channels);
228
    s->fmt_conv.float_to_int16_interleave(out, (const float **)s->coeffs_ptr,
229
                                          s->frame_len, s->channels);
226 230

  
227 231
    if (!s->first) {
228 232
        int count = s->overlap_len * s->channels;

Also available in: Unified diff