On Sat, Jul 30, 2011 at 7:08 AM, Diego Biurrun <[email protected]> wrote: > gRouped
Message updated. Ping? -- -Nathan Caldwell
From ccf60d690c4b9707e9a12b50c4954bb7200d8351 Mon Sep 17 00:00:00 2001 From: Nathan Caldwell <[email protected]> Date: Sat, 23 Jul 2011 01:19:34 -0600 Subject: [PATCH 1/2] aacenc: Fix a segfault with grouped psymodel. To: libav development <[email protected]> 10l: Forgot about TYPE_LFE being after TYPE_CPE. Which causes a segfault when encoding 5.1 --- libavcodec/aacenc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 9e876ff..5a1fc94 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -165,6 +165,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) AACEncContext *s = avctx->priv_data; int i; const uint8_t *sizes[2]; + uint8_t grouping[AAC_MAX_CHANNELS]; int lengths[2]; avctx->frame_size = 1024; @@ -210,7 +211,9 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) sizes[1] = swb_size_128[i]; lengths[0] = ff_aac_num_swb_1024[i]; lengths[1] = ff_aac_num_swb_128[i]; - ff_psy_init(&s->psy, avctx, 2, sizes, lengths, s->chan_map[0], &s->chan_map[1]); + for (i = 0; i < s->chan_map[0]; i++) + grouping[i] = s->chan_map[i + 1] == TYPE_CPE; + ff_psy_init(&s->psy, avctx, 2, sizes, lengths, s->chan_map[0], grouping); s->psypp = ff_psy_preprocess_init(avctx); s->coder = &ff_aac_coders[2]; -- 1.7.4.1
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
