opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 21:08:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

AAC: escape_sequence is 21 bits max

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

Originally committed as revision 21151 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2010-01-11 18:02:00 +00:00
parent 5d629b72cb
commit 7c8af53f87
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aac.c
View File

@ -942,9 +942,9 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
if (vq_ptr[j] == 64.0f) { if (vq_ptr[j] == 64.0f) {
int n = 4; int n = 4;
/* The total length of escape_sequence must be < 22 bits according /* The total length of escape_sequence must be < 22 bits according
to the specification (i.e. max is 11111111110xxxxxxxxxx). */ to the specification (i.e. max is 111111110xxxxxxxxxxxx). */
while (get_bits1(gb) && n < 15) n++; while (get_bits1(gb) && n < 13) n++;
if (n == 15) { if (n == 13) {
av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n");
return -1; return -1;
} }