Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 21:03:44 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 21:04:04 +0000 (22:04 +0100)
* 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>
1  2 
libavcodec/aacsbr.c

Simple merge