Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:20:02 +0000 (22:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 May 2015 20:20:36 +0000 (22:20 +0200)
* commit '8fc8024ea56e814cd257d5fe27b21a865080782f':
  aasc: return correct buffer size from aasc_decode_frame

See: 0be54ad280cf114c02306b7063147e8379f8ed1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge