On Fri, Oct 21, 2011 at 01:41:39PM +0300, Jan E wrote: > From: Michael Niedermayer <[email protected]> > > Fixes FFmpeg ticket 200. > > Signed-off-by: Michael Niedermayer <[email protected]> > --- > libavcodec/aacdec.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c > index 8338e25..41d1aaa 100644 > --- a/libavcodec/aacdec.c > +++ b/libavcodec/aacdec.c > @@ -2311,6 +2311,7 @@ static int latm_decode_audio_specific_config(struct > LATMContext *latmctx, > { > AVCodecContext *avctx = latmctx->aac_ctx.avctx; > MPEG4AudioConfig m4ac; > + AACContext *ac= &latmctx->aac_ctx; > int config_start_bit = get_bits_count(gb); > int bits_consumed, esize; > > @@ -2320,12 +2321,13 @@ static int latm_decode_audio_specific_config(struct > LATMContext *latmctx, > return AVERROR_INVALIDDATA; > } else { > bits_consumed = > - decode_audio_specific_config(NULL, avctx, &m4ac, > + decode_audio_specific_config(ac, avctx, &m4ac, > gb->buffer + (config_start_bit / 8), > get_bits_left(gb) / 8, asclen); > > if (bits_consumed < 0) > return AVERROR_INVALIDDATA; > + ac->m4ac= m4ac; > > esize = (bits_consumed+7) / 8; >
this looks wrong but if it's a correct solution it should be fixed differently. I'll handle it. Janne _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
