virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

aacdec: Support for ER AAC in LATM

Browse Source
This commit is contained in:
Niel van der Westhuizen 2015-01-21 21:24:23 -08:00 committed by Alex Converse
parent edd9ea3ffb
commit 0ee2573347
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/aacdec.c
View File

@ -3235,7 +3235,17 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if ((err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb)) < 0) switch (latmctx->aac_ctx.oc[1].m4ac.object_type) {
case AOT_ER_AAC_LC:
case AOT_ER_AAC_LTP:
case AOT_ER_AAC_LD:
case AOT_ER_AAC_ELD:
err = aac_decode_er_frame(avctx, out, got_frame_ptr, &gb);
break;
default:
err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb);
}
if (err < 0)
return err; return err;
return muxlength; return muxlength;