diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-29 18:58:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-29 18:58:13 +0100 |
| commit | 14285c3331bc3b9c80a2da2862830069ad265415 (patch) | |
| tree | 0f01c4998802ebb13edce6327b170d6155fe9dde /libavcodec | |
| parent | cae851c78921affbd178b1eb522fbf619715c1c4 (diff) | |
| download | ffmpeg-14285c3331bc3b9c80a2da2862830069ad265415.tar.gz | |
avcodec/aacenc: Use avpriv_float_dsp_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacenc.c | 7 | ||||
| -rw-r--r-- | libavcodec/aacenc.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index be0c950322..d9c72155b1 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -252,7 +252,7 @@ static void apply_window_and_mdct(AACEncContext *s, SingleChannelElement *sce, int i; float *output = sce->ret_buf; - apply_window[sce->ics.window_sequence[0]](&s->fdsp, sce, audio); + apply_window[sce->ics.window_sequence[0]](s->fdsp, sce, audio); if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) s->mdct1024.mdct_calc(&s->mdct1024, sce->coeffs, output); @@ -682,6 +682,7 @@ static av_cold int aac_encode_end(AVCodecContext *avctx) ff_psy_preprocess_end(s->psypp); av_freep(&s->buffer.samples); av_freep(&s->cpe); + av_freep(&s->fdsp); ff_af_queue_close(&s->afq); return 0; } @@ -690,7 +691,9 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s) { int ret = 0; - avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); + s->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT); + if (!s->fdsp) + return AVERROR(ENOMEM); // window init ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index ecd6811f31..0decb1dc2c 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -67,7 +67,7 @@ typedef struct AACEncContext { PutBitContext pb; FFTContext mdct1024; ///< long (1024 samples) frame transform context FFTContext mdct128; ///< short (128 samples) frame transform context - AVFloatDSPContext fdsp; + AVFloatDSPContext *fdsp; float *planar_samples[6]; ///< saved preprocessed input int samplerate_index; ///< MPEG-4 samplerate index |