Browse Source

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>
tags/n0.8
Nathan Caldwell Ronald S. Bultje 14 years ago
parent
commit
31ff9bd7b8
2 changed files with 1 additions and 2 deletions
  1. +0
    -1
      libavcodec/aacenc.c
  2. +1
    -1
      libavcodec/aacenc.h

+ 0
- 1
libavcodec/aacenc.c View File

@@ -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;


+ 1
- 1
libavcodec/aacenc.h View File

@@ -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 */

Loading…
Cancel
Save