diff options
| author | Nathan Caldwell <saintdev@gmail.com> | 2011-03-08 01:22:14 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-08 17:45:08 -0500 |
| commit | 31ff9bd7b8cd8236f70e2bf5368a480fa49f7d27 (patch) | |
| tree | f7c65bc5c7931f59b405539f29f8854b884ebda1 | |
| parent | 66e5b1df360a28b083bc9ec5a76e7add5f40ce1f (diff) | |
| download | ffmpeg-31ff9bd7b8cd8236f70e2bf5368a480fa49f7d27.tar.gz | |
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: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavcodec/aacenc.c | 1 | ||||
| -rw-r--r-- | libavcodec/aacenc.h | 2 |
2 files changed, 1 insertions, 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 */ |