aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-28 20:08:39 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-12-28 20:08:39 +0000
commit6735e2c810b7ad29c621ad9363cf415b2ba8bdf3 (patch)
tree36a1057f776d1819d6bba0a3d5ac8a3acd04af9b
parent69b38d4dc3b6cb3c1857cc18bc2762469efe602a (diff)
downloadffmpeg-6735e2c810b7ad29c621ad9363cf415b2ba8bdf3.tar.gz
Revert r16375: It broke aac decoding.
Originally committed as revision 16376 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aac.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index c9af1c84fd..e815041618 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -1482,8 +1482,7 @@ static void apply_channel_coupling(AACContext * ac, ChannelElement * cc,
* Convert spectral data to float samples, applying all supported tools as appropriate.
*/
static void spectral_to_sample(AACContext * ac) {
- int i;
- enum RawDataBlockType type;
+ int i, type;
for(type = 3; type >= 0; type--) {
for (i = 0; i < MAX_ELEM_ID; i++) {
ChannelElement *che = ac->che[type][i];