diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:26:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 21:30:36 +0100 |
| commit | 45f62c74dd40b0f2a83ac452c087fe0664d9e27b (patch) | |
| tree | 4ae2436e1f0479170549baa049c999fb5ff3715d /libavcodec | |
| parent | 66de11b064fc7184d765a1f5fe2e1280854071cc (diff) | |
| parent | cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0 (diff) | |
| download | ffmpeg-45f62c74dd40b0f2a83ac452c087fe0664d9e27b.tar.gz | |
Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'
* commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0':
aacsbr: Fix type for index variable
See: a15adabdd32c8736c143fcbef36a0f4a75f772f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacsbr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 94a5685e98..aa88e253f2 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -635,7 +635,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr, GetBitContext *gb, SBRData *ch_data) { int i; - unsigned bs_pointer = 0; + int bs_pointer = 0; // frameLengthFlag ? 15 : 16; 960 sample length frames unsupported; this value is numTimeSlots int abs_bord_trail = 16; int num_rel_lead, num_rel_trail; @@ -728,7 +728,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr, break; } - if (bs_pointer > ch_data->bs_num_env + 1) { + if (bs_pointer < 0 || bs_pointer > ch_data->bs_num_env + 1) { av_log(ac->avctx, AV_LOG_ERROR, "Invalid bitstream, bs_pointer points to a middle noise border outside the time borders table: %d\n", bs_pointer); @@ -747,11 +747,11 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr, ch_data->t_q[0] = ch_data->t_env[0]; ch_data->t_q[ch_data->bs_num_noise] = ch_data->t_env[ch_data->bs_num_env]; if (ch_data->bs_num_noise > 1) { - unsigned int idx; + int idx; if (ch_data->bs_frame_class == FIXFIX) { idx = ch_data->bs_num_env >> 1; } else if (ch_data->bs_frame_class & 1) { // FIXVAR or VARVAR - idx = ch_data->bs_num_env - FFMAX((int)bs_pointer - 1, 1); + idx = ch_data->bs_num_env - FFMAX(bs_pointer - 1, 1); } else { // VARFIX if (!bs_pointer) idx = 1; |