summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-04 17:30:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-04 17:37:28 +0100
commita15adabdd32c8736c143fcbef36a0f4a75f772f0 (patch)
tree1466f582a0ee8051e2670c4c4884ba58b220875b
parentb5d496f3a4c3e77deca650e03fca5d9365a06845 (diff)
aacsbr: fix integer overflow
Fixes CID603186 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/aacsbr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 1d15177ded..ceff2eaa5b 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -749,7 +749,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr,
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(bs_pointer - 1, 1);
+ idx = ch_data->bs_num_env - FFMAX((int)bs_pointer - 1, 1);
} else { // VARFIX
if (!bs_pointer)
idx = 1;