[FFmpeg-cvslog] r15303 - trunk/libavcodec/aac.c

[superdump]

Author: superdump
Date: Fri Sep 12 16:32:49 2008
New Revision: 15303

Log:
Only read some of TNS bitstream data in the case that the TNS filter order is
non-zero as per the specification.

Patch by Alex Converse (alex converse gmail com)
Fixes another issue pertaining to issue632


Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	(original)
+++ trunk/libavcodec/aac.c	Fri Sep 12 16:32:49 2008
@@ -629,6 +629,7 @@ static int decode_tns(AACContext * ac, T
                     tns->order[w][filt] = 0;
                     return -1;
                 }
+                if (tns->order[w][filt]) {
                 tns->direction[w][filt] = get_bits1(gb);
                 coef_compress = get_bits1(gb);
                 coef_len = coef_res + 3 - coef_compress;
@@ -636,6 +637,7 @@ static int decode_tns(AACContext * ac, T
 
                 for (i = 0; i < tns->order[w][filt]; i++)
                     tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
+                }
             }
         }
     }