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)
commitdf82125acba5699c74ebe7e1c9293e328e9a9f8a
tree880b5239f9e1e870954f5f554019caa0fa92a6c7
parentce63cb4ff217d588a8a55137313b5a6bdf0fdd8f
parent930ffd46e1e742674aa7cc1c2450020c63b5015b
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>
libavcodec/aacsbr.c