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)
commitce63cb4ff217d588a8a55137313b5a6bdf0fdd8f
tree9b196b700a809b716a261590c52d3f072961142a
parentd9103e848dae589cf8a9005c1277f08f6bda4957
parent9f6f407463ff8b7681befd04b6655bb7c6d9b3e1
Merge commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1'

* commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1':
  aacsbr: treat 1-d arrays as such

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