[FFmpeg-cvslog] r17672 - trunk/libavcodec/aac.c

[alexc]

Author: alexc
Date: Sun Mar  1 01:23:05 2009
New Revision: 17672

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

Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Sun Mar  1 01:12:08 2009	(r17671)
+++ trunk/libavcodec/aac.c	Sun Mar  1 01:23:05 2009	(r17672)
@@ -1075,11 +1075,9 @@ static void apply_intensity_stereo(Chann
  *
  * @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;
-    ChannelElement * cpe;
 
-    cpe = ac->che[TYPE_CPE][elem_id];
     common_window = get_bits1(gb);
     if (common_window) {
         if (decode_ics_info(ac, &cpe->ch[0].ics, gb, 1))
@@ -1595,7 +1593,7 @@ static int aac_decode_frame(AVCodecConte
             break;
 
         case TYPE_CPE:
-            err = decode_cpe(ac, &gb, elem_id);
+            err = decode_cpe(ac, &gb, ac->che[TYPE_CPE][elem_id]);
             break;
 
         case TYPE_CCE: