summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-04-05 12:21:50 +0200
committerJanne Grunau <janne-libav@jannau.net>2011-04-05 12:21:50 +0200
commitd6f66edd65992c1275f8e4271be212e1a4808425 (patch)
tree08503a6ece219392a1af712d583bcbca5e9823d2 /libavcodec
parentf4f05c459c41e8c43d3642a96001c69bc7173544 (diff)
Revert "aac_latm_dec: use aac context and aac m4ac"
This reverts commit 36864ac3540445c513484017aa9927e942fac24a since it breaks LATM decoding in ffplay.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aacdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 05bd7ed3d3..3ce0dce491 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);