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)
commit54d985db847bb3b9b9a45790bc9343c4afe0b14e
tree35754426c5bc8a5858c60719f416178723e6ac9e
parent5a455dd011151fd7e3f8aced745b206ca1413d29
parent8fc8024ea56e814cd257d5fe27b21a865080782f
Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'

* commit '8fc8024ea56e814cd257d5fe27b21a865080782f':
  aasc: return correct buffer size from aasc_decode_frame

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