aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-12-16 11:39:14 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2009-12-16 11:39:14 +0000
commitb0bc928b8682c9c4cd1d09f4b928df61fc68bc07 (patch)
tree737eb21ff5ffe0c43224178d0e1d881efd9a35d7
parent18a49f118cd288cf510d003e0716a042f7cba2b0 (diff)
downloadffmpeg-b0bc928b8682c9c4cd1d09f4b928df61fc68bc07.tar.gz
Undo r20874: It broke AAC decoding.
Originally committed as revision 20879 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aac.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index ae09d19ed2..c53d56813d 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -1645,9 +1645,8 @@ static void apply_channel_coupling(AACContext *ac, ChannelElement *cc,
*/
static void spectral_to_sample(AACContext *ac)
{
- enum RawDataBlockType type;
- for (type = TYPE_LFE; type >= TYPE_SCE; type--) {
- int i;
+ int i, type;
+ for (type = 3; type >= 0; type--) {
for (i = 0; i < MAX_ELEM_ID; i++) {
ChannelElement *che = ac->che[type][i];
if (che) {