RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aac: Handle HE-AACv2 when sniffing a channel order.

This commit is contained in:
Alex Converse 2012-04-20 14:01:57 -07:00
parent dc878b96a7
commit 7eacd70fea
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/aacdec.c
View File

@ -404,6 +404,13 @@ static int output_configure(AACContext *ac,
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
if (ac->oc[1].m4ac.ps == 1 && channels == 2) {
if (layout == AV_CH_FRONT_CENTER) {
layout = AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT;
} else {
layout = 0;
}
}
memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0])); memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
avctx->channel_layout = ac->oc[1].channel_layout = layout; avctx->channel_layout = ac->oc[1].channel_layout = layout;