Merge commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 20:52:58 +0000 (21:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Nov 2014 20:53:21 +0000 (21:53 +0100)
* commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1':
  aacsbr: treat 1-d arrays as such

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aacsbr.c

Simple merge