On Fri, Jul 29, 2011 at 1:58 PM, Nathan Caldwell <[email protected]> wrote: > 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..e74af0b 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[6];
Is there an appropriate define that can be used here? > 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]; > otherwise looks ok _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
