From f56c4850e7d3903eb31499edb3ef8352905c6cc2 Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Tue, 8 Mar 2011 01:22:14 -0700 Subject: [PATCH] aacenc: Fix a segfault in search_for_quantizers This reverts the removal of scoefs from AACEncContext. It resulted in scoefs being a NULL pointer when search_for_quantizers() is called. Signed-off-by: Michael Niedermayer --- libavcodec/aacenc.c | 1 - libavcodec/aacenc.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 17ae6f99d3..0ca390e72b 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -598,7 +598,6 @@ static int aac_encode_frame(AVCodecContext *avctx, } for (j = 0; j < chans; j++) { s->cur_channel = start_ch + j; - s->scoefs = cpe->ch[j].ret; encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window); } start_ch += chans; diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 3559234ff1..1c8467990c 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -63,8 +63,8 @@ typedef struct AACEncContext { int cur_channel; int last_frame; float lambda; - float *scoefs; ///< scaled coefficients DECLARE_ALIGNED(16, int, qcoefs)[96]; ///< quantized coefficients + DECLARE_ALIGNED(16, float, scoefs)[1024]; ///< scaled coefficients } AACEncContext; #endif /* AVCODEC_AACENC_H */