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

[mru]

Author: mru
Date: Mon Jan 11 19:02:00 2010
New Revision: 21151

Log:
AAC: escape_sequence is 21 bits max

The maximum length of escape_sequence is 21 bits, so adjust limit in
code to match this.  Also fix the comment.

Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Mon Jan 11 18:45:17 2010	(r21150)
+++ trunk/libavcodec/aac.c	Mon Jan 11 19:02:00 2010	(r21151)
@@ -942,9 +942,9 @@ static int decode_spectrum_and_dequant(A
                                     if (vq_ptr[j] == 64.0f) {
                                         int n = 4;
                                         /* The total length of escape_sequence must be < 22 bits according
-                                           to the specification (i.e. max is 11111111110xxxxxxxxxx). */
-                                        while (get_bits1(gb) && n < 15) n++;
-                                        if (n == 15) {
+                                           to the specification (i.e. max is 111111110xxxxxxxxxxxx). */
+                                        while (get_bits1(gb) && n < 13) n++;
+                                        if (n == 13) {
                                             av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n");
                                             return -1;
                                         }