Revert "aac_latm_dec: use aac context and aac m4ac"

This reverts commit 36864ac354 since it breaks LATM decoding in ffplay.
14 years ago · d6f66edd65
parent f4f05c459c
commit d6f66edd65
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@ -2250,6 +2250,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
                                             GetBitContext *gb)
 {
    AVCodecContext *avctx = latmctx->aac_ctx.avctx;
+    MPEG4AudioConfig m4ac;
    int  config_start_bit = get_bits_count(gb);
    int     bits_consumed, esize;

@ -2259,8 +2260,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
        return AVERROR_INVALIDDATA;
    } else {
        bits_consumed =
-            decode_audio_specific_config(&latmctx->aac_ctx, avctx,
-                                         &latmctx->aac_ctx.m4ac,
+            decode_audio_specific_config(NULL, avctx, &m4ac,
                                         gb->buffer + (config_start_bit / 8),
                                         get_bits_left(gb) / 8);