Commit 31ff9bd7 authored by Nathan Caldwell's avatar Nathan Caldwell Committed by Ronald S. Bultje
Browse files

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: default avatarRonald S. Bultje <>
parent 66e5b1df
......@@ -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;
......@@ -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 */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment