Revision c73d99e6 libavcodec/vorbis_dec.c

View differences:

libavcodec/vorbis_dec.c
31 31
#include "get_bits.h"
32 32
#include "dsputil.h"
33 33
#include "fft.h"
34
#include "fmtconvert.h"
34 35

  
35 36
#include "vorbis.h"
36 37
#include "xiph.h"
......
127 128
    AVCodecContext *avccontext;
128 129
    GetBitContext gb;
129 130
    DSPContext dsp;
131
    FmtConvertContext fmt_conv;
130 132

  
131 133
    FFTContext mdct[2];
132 134
    uint_fast8_t  first_frame;
......
961 963

  
962 964
    vc->avccontext = avccontext;
963 965
    dsputil_init(&vc->dsp, avccontext);
966
    ff_fmt_convert_init(&vc->fmt_conv, avccontext);
964 967

  
965 968
    vc->scale_bias = 32768.0f;
966 969

  
......
1636 1639
                              len * ff_vorbis_channel_layout_offsets[vc->audio_channels - 1][i];
1637 1640
    }
1638 1641

  
1639
    vc->dsp.float_to_int16_interleave(data, channel_ptrs, len, vc->audio_channels);
1642
    vc->fmt_conv.float_to_int16_interleave(data, channel_ptrs, len,
1643
                                           vc->audio_channels);
1640 1644
    *data_size = len * 2 * vc->audio_channels;
1641 1645

  
1642 1646
    return buf_size ;

Also available in: Unified diff