diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-14 12:37:01 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-02 10:19:04 -0400 |
| commit | fac6b7f9f22d4fc3a275af7af9d9754356d48d89 (patch) | |
| tree | 1ebf8b1094a8a94cfd88b09bf9afcc43ed9a126b | |
| parent | 32b484464cf68ddc072ebd4ed29a8aed7a51070b (diff) | |
| download | ffmpeg-fac6b7f9f22d4fc3a275af7af9d9754356d48d89.tar.gz | |
nellymoserdec: allocate float_buf only when decoding to int16
| -rw-r--r-- | libavcodec/nellymoserdec.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index d7d1abab25..2d59abf9a8 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -47,7 +47,7 @@ typedef struct NellyMoserDecodeContext { AVCodecContext* avctx; - DECLARE_ALIGNED(32, float, float_buf)[NELLY_SAMPLES]; + float *float_buf; float state[NELLY_BUF_LEN]; AVLFG random_state; GetBitContext gb; @@ -145,6 +145,11 @@ static av_cold int decode_init(AVCodecContext * avctx) { s->scale_bias = 1.0/(1*8); avctx->sample_fmt = AV_SAMPLE_FMT_S16; ff_fmt_convert_init(&s->fmt_conv, avctx); + s->float_buf = av_mallocz(NELLY_SAMPLES * sizeof(*s->float_buf)); + if (!s->float_buf) { + av_log(avctx, AV_LOG_ERROR, "error allocating float buffer\n"); + return AVERROR(ENOMEM); + } } /* Generate overlap window */ @@ -208,6 +213,7 @@ static int decode_tag(AVCodecContext * avctx, static av_cold int decode_end(AVCodecContext * avctx) { NellyMoserDecodeContext *s = avctx->priv_data; + av_freep(&s->float_buf); ff_mdct_end(&s->imdct_ctx); return 0; } |