generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nellymoserdec: allocate float_buf only when decoding to int16

Browse Source
This commit is contained in:
Justin Ruggles
2011-09-14 12:37:01 -04:00
parent 32b484464c
commit fac6b7f9f2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/nellymoserdec.c
View File

@@ -47,7 +47,7 @@
typedef struct NellyMoserDecodeContext { typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx; AVCodecContext* avctx;
DECLARE_ALIGNED(32, float, float_buf)[NELLY_SAMPLES]; float *float_buf;
float state[NELLY_BUF_LEN]; float state[NELLY_BUF_LEN];
AVLFG random_state; AVLFG random_state;
GetBitContext gb; GetBitContext gb;
@@ -145,6 +145,11 @@ static av_cold int decode_init(AVCodecContext * avctx) {
s->scale_bias = 1.0/(1*8); s->scale_bias = 1.0/(1*8);
avctx->sample_fmt = AV_SAMPLE_FMT_S16; avctx->sample_fmt = AV_SAMPLE_FMT_S16;
ff_fmt_convert_init(&s->fmt_conv, avctx); 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 */ /* Generate overlap window */
@@ -208,6 +213,7 @@ static int decode_tag(AVCodecContext * avctx,
static av_cold int decode_end(AVCodecContext * avctx) { static av_cold int decode_end(AVCodecContext * avctx) {
NellyMoserDecodeContext *s = avctx->priv_data; NellyMoserDecodeContext *s = avctx->priv_data;
av_freep(&s->float_buf);
ff_mdct_end(&s->imdct_ctx); ff_mdct_end(&s->imdct_ctx);
return 0; return 0;
} }