diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-03-01 00:23:05 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-03-01 00:23:05 +0000 |
| commit | 9ef88afac3b4dc3a58822002f673a8e5b47295ac (patch) | |
| tree | b2425ade8be11e968a2e1867c9fb2492bfdd2880 /libavcodec/aac.c | |
| parent | 719e721a145680bec580f644788179435b43754a (diff) | |
| download | ffmpeg-9ef88afac3b4dc3a58822002f673a8e5b47295ac.tar.gz | |
AAC: Make the CPE function more consistent with the functions for other channel elements.
Originally committed as revision 17672 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.c')
| -rw-r--r-- | libavcodec/aac.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c index 9eb4711ffa..80195c0641 100644 --- a/libavcodec/aac.c +++ b/libavcodec/aac.c @@ -1075,11 +1075,9 @@ static void apply_intensity_stereo(ChannelElement * cpe, int ms_present) { * * @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(AVCodecContext * avccontext, void * data, int * data 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: |