diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 22:03:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-04 22:04:04 +0100 |
| commit | df82125acba5699c74ebe7e1c9293e328e9a9f8a (patch) | |
| tree | 880b5239f9e1e870954f5f554019caa0fa92a6c7 /libavcodec | |
| parent | ce63cb4ff217d588a8a55137313b5a6bdf0fdd8f (diff) | |
| parent | 930ffd46e1e742674aa7cc1c2450020c63b5015b (diff) | |
| download | ffmpeg-df82125acba5699c74ebe7e1c9293e328e9a9f8a.tar.gz | |
Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'
* commit '930ffd46e1e742674aa7cc1c2450020c63b5015b':
aacsbr: change order of operation to prevent out of array read
Conflicts:
libavcodec/aacsbr.c
See: c2340831b8e9032716acb0aab4893d3cc500213a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacsbr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index e3ddfc9c7e..ebe2520c4a 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -556,7 +556,8 @@ static int sbr_hf_calc_npatches(AACContext *ac, SpectralBandReplication *sbr) k = sbr->n_master; } while (sb != sbr->kx[1] + sbr->m[1]); - if (sbr->num_patches > 1 && sbr->patch_num_subbands[sbr->num_patches-1] < 3) + if (sbr->num_patches > 1 && + sbr->patch_num_subbands[sbr->num_patches - 1] < 3) sbr->num_patches--; return 0; |