From 341b28c0d274ade7902588697ec1d8bdfe449185 Mon Sep 17 00:00:00 2001
From: Robert Swain <robert.swain@gmail.com>
Date: Thu, 18 Sep 2008 16:02:51 +0000
Subject: [PATCH] Zero 'idx' for each iteration of the coupling gain loop and
 as it is only used within this loop, we can move its declaration there too.
 This fixes bitstream desync when decoding streams containing CCEs.

Based on a patch by Alex Converse (alex converse gmail com)

Originally committed as revision 15364 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/aac.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index d92ea98b73..eca6a9aa89 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -950,7 +950,7 @@ static int decode_cpe(AACContext * ac, GetBitContext * gb, int elem_id) {
  */
 static int decode_cce(AACContext * ac, GetBitContext * gb, ChannelElement * che) {
     int num_gain = 0;
-    int c, g, sfb, ret, idx = 0;
+    int c, g, sfb, ret;
     int sign;
     float scale;
     SingleChannelElement * sce = &che->ch[0];
@@ -985,6 +985,7 @@ static int decode_cce(AACContext * ac, GetBitContext * gb, ChannelElement * che)
         return ret;
 
     for (c = 0; c < num_gain; c++) {
+        int idx = 0;
         int cge = 1;
         int gain = 0;
         float gain_cache = 1.;