Revert "aac_latm_dec: use aac context and aac m4ac"
authorJanne Grunau <janne-libav@jannau.net>
Tue, 5 Apr 2011 10:21:50 +0000 (12:21 +0200)
committerJanne Grunau <janne-libav@jannau.net>
Tue, 5 Apr 2011 10:21:50 +0000 (12:21 +0200)
This reverts commit 36864ac3540445c513484017aa9927e942fac24a since it
breaks LATM decoding in ffplay.

libavcodec/aacdec.c

index 05bd7ed..3ce0dce 100644 (file)
@@ -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);