Revision c73d99e6 libavcodec/aacdec.c

View differences:

libavcodec/aacdec.c
85 85
#include "get_bits.h"
86 86
#include "dsputil.h"
87 87
#include "fft.h"
88
#include "fmtconvert.h"
88 89
#include "lpc.h"
89 90

  
90 91
#include "aac.h"
......
562 563
    ff_aac_sbr_init();
563 564

  
564 565
    dsputil_init(&ac->dsp, avctx);
566
    ff_fmt_convert_init(&ac->fmt_conv, avctx);
565 567

  
566 568
    ac->random_state = 0x1f2e3d4c;
567 569

  
......
2032 2034
    *data_size = data_size_tmp;
2033 2035

  
2034 2036
    if (samples)
2035
        ac->dsp.float_to_int16_interleave(data, (const float **)ac->output_data, samples, avctx->channels);
2037
        ac->fmt_conv.float_to_int16_interleave(data, (const float **)ac->output_data, samples, avctx->channels);
2036 2038

  
2037 2039
    if (ac->output_configured)
2038 2040
        ac->output_configured = OC_LOCKED;

Also available in: Unified diff