diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-20 22:21:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-20 22:30:48 +0100 |
| commit | 8bce5c8e74b5664c0aca1cc2b1c45cce0a55909c (patch) | |
| tree | 998e8abb6a3ac051d05e16f449e78a0f5bc3856f | |
| parent | 17b7f99d810d73f0cab2a4ebdffbf859679216f5 (diff) | |
| download | ffmpeg-8bce5c8e74b5664c0aca1cc2b1c45cce0a55909c.tar.gz | |
avcodec/ac3dec: Use avpriv_float_dsp_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ac3dec.c | 8 | ||||
| -rw-r--r-- | libavcodec/ac3dec.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 969e37ffb8..d3e8713e03 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -195,7 +195,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) #if (USE_FIXED) s->fdsp = avpriv_alloc_fixed_dsp(avctx->flags & CODEC_FLAG_BITEXACT); #else - avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); + s->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT); #endif ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT); @@ -688,7 +688,7 @@ static inline void do_imdct(AC3DecodeContext *s, int channels) s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1], s->tmp_output, s->window, 128, 8); #else - s->fdsp.vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1], + s->fdsp->vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1], s->tmp_output, s->window, 128); #endif for (i = 0; i < 128; i++) @@ -700,7 +700,7 @@ static inline void do_imdct(AC3DecodeContext *s, int channels) s->fdsp->vector_fmul_window_scaled(s->outptr[ch - 1], s->delay[ch - 1], s->tmp_output, s->window, 128, 8); #else - s->fdsp.vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1], + s->fdsp->vector_fmul_window(s->outptr[ch - 1], s->delay[ch - 1], s->tmp_output, s->window, 128); #endif memcpy(s->delay[ch - 1], s->tmp_output + 128, 128 * sizeof(FFTSample)); @@ -1635,9 +1635,7 @@ static av_cold int ac3_decode_end(AVCodecContext *avctx) AC3DecodeContext *s = avctx->priv_data; ff_mdct_end(&s->imdct_512); ff_mdct_end(&s->imdct_256); -#if (USE_FIXED) av_freep(&s->fdsp); -#endif return 0; } diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index a213bc0870..be29f00b14 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -218,7 +218,7 @@ typedef struct AC3DecodeContext { #if USE_FIXED AVFixedDSPContext *fdsp; #else - AVFloatDSPContext fdsp; + AVFloatDSPContext *fdsp; #endif AC3DSPContext ac3dsp; FmtConvertContext fmt_conv; ///< optimized conversion functions |