Reindent after last commit
authorRobert Swain <robert.swain@gmail.com>
Thu, 21 Aug 2008 12:13:22 +0000 (12:13 +0000)
committerRobert Swain <robert.swain@gmail.com>
Thu, 21 Aug 2008 12:13:22 +0000 (12:13 +0000)
Originally committed as revision 14882 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/aac.c

index 26d860a..7459f4f 100644 (file)
@@ -618,24 +618,24 @@ static int decode_tns(AACContext * ac, TemporalNoiseShaping * tns,
         if ((tns->n_filt[w] = get_bits(gb, 2 - is8))) {
             coef_res = get_bits1(gb);
 
-        for (filt = 0; filt < tns->n_filt[w]; filt++) {
-            int tmp2_idx;
-            tns->length[w][filt] = get_bits(gb, 6 - 2*is8);
+            for (filt = 0; filt < tns->n_filt[w]; filt++) {
+                int tmp2_idx;
+                tns->length[w][filt] = get_bits(gb, 6 - 2*is8);
+
+                if ((tns->order[w][filt] = get_bits(gb, 5 - 2*is8)) > tns_max_order) {
+                    av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.",
+                           tns->order[w][filt], tns_max_order);
+                    tns->order[w][filt] = 0;
+                    return -1;
+                }
+                tns->direction[w][filt] = get_bits1(gb);
+                coef_compress = get_bits1(gb);
+                coef_len = coef_res + 3 - coef_compress;
+                tmp2_idx = 2*coef_compress + coef_res;
 
-            if ((tns->order[w][filt] = get_bits(gb, 5 - 2*is8)) > tns_max_order) {
-                av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.",
-                       tns->order[w][filt], tns_max_order);
-                tns->order[w][filt] = 0;
-                return -1;
+                for (i = 0; i < tns->order[w][filt]; i++)
+                    tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
             }
-            tns->direction[w][filt] = get_bits1(gb);
-            coef_compress = get_bits1(gb);
-            coef_len = coef_res + 3 - coef_compress;
-            tmp2_idx = 2*coef_compress + coef_res;
-
-            for (i = 0; i < tns->order[w][filt]; i++)
-                tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
-        }
         }
     }
     return 0;