virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

Revert "aac_latm_dec: use aac context and aac m4ac"

Browse Source 
This reverts commit 36864ac3540445c513484017aa9927e942fac24a since it
breaks LATM decoding in ffplay.
This commit is contained in:
Janne Grunau 2011-04-05 12:21:50 +02:00
parent f4f05c459c
commit d6f66edd65
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aacdec.c
View File

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