[FFmpeg-cvslog] Revert "aac_latm_dec: use aac context and aac m4ac"

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Tue Apr  5 12:21:50 2011 +0200| [d6f66edd65992c1275f8e4271be212e1a4808425] | committer: Janne Grunau

Revert "aac_latm_dec: use aac context and aac m4ac"

This reverts commit 36864ac3540445c513484017aa9927e942fac24a since it
breaks LATM decoding in ffplay.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6f66edd65992c1275f8e4271be212e1a4808425
---

 libavcodec/aacdec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 05bd7ed..3ce0dce 100644
--- 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);