highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAC: Make the CPE function more consistent with the functions for other channel elements.

Browse Source 
Originally committed as revision 17672 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2009-03-01 00:23:05 +00:00
parent 719e721a14
commit 9ef88afac3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aac.c
View File

@ -1075,11 +1075,9 @@ static void apply_intensity_stereo(ChannelElement * cpe, int ms_present) {
* *
* @return Returns error status. 0 - OK, !0 - error * @return Returns error status. 0 - OK, !0 - error
*/ */
static int decode_cpe(AACContext * ac, GetBitContext * gb, int elem_id) { static int decode_cpe(AACContext * ac, GetBitContext * gb, ChannelElement * cpe) {
int i, ret, common_window, ms_present = 0; int i, ret, common_window, ms_present = 0;
ChannelElement * cpe;
cpe = ac->che[TYPE_CPE][elem_id];
common_window = get_bits1(gb); common_window = get_bits1(gb);
if (common_window) { if (common_window) {
if (decode_ics_info(ac, &cpe->ch[0].ics, gb, 1)) if (decode_ics_info(ac, &cpe->ch[0].ics, gb, 1))
@ -1595,7 +1593,7 @@ static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data
break; break;
case TYPE_CPE: case TYPE_CPE:
err = decode_cpe(ac, &gb, elem_id); err = decode_cpe(ac, &gb, ac->che[TYPE_CPE][elem_id]);
break; break;
case TYPE_CCE: case TYPE_CCE: