diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-08-29 19:15:52 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-08-29 19:15:52 +0100 |
| commit | 49854c56c2346a7e82ccb6b6e19fa2d2c159d4b9 (patch) | |
| tree | 3eab553b7e056a35ce6226e79d3bf2227713e794 /libavcodec | |
| parent | 0818705bf37e2c62de1947f1c06ad63262e51fc6 (diff) | |
| download | ffmpeg-49854c56c2346a7e82ccb6b6e19fa2d2c159d4b9.tar.gz | |
aacenc: initialize LPC context with MAX_LPC_ORDER
The order should never go above TNS_MAX_ORDER (and thus cause
the context to be reinitialized) but this is just in case.
Also fix a comparison, since the coefficients are zero-indexed.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/aacenc_tns.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 09dd0dda7f..a32f0d415e 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -822,7 +822,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) goto fail; s->psypp = ff_psy_preprocess_init(avctx); s->coder = &ff_aac_coders[s->options.aac_coder]; - ff_lpc_init(&s->lpc, avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON); + ff_lpc_init(&s->lpc, avctx->frame_size, MAX_LPC_ORDER, FF_LPC_TYPE_LEVINSON); if (HAVE_MIPSDSPR1) ff_aac_coder_init_mips(s); diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index e948b32ba8..5e02c4fb44 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -205,7 +205,7 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) if (sfb_len <= 0 || coef_len <= 0) continue; - if (coef_start + coef_len > 1024) + if (coef_start + coef_len >= 1024) coef_len = 1024 - coef_start; /* LPC */ |