[FFmpeg-cvslog] Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May  5 22:20:02 2015 +0200| [54d985db847bb3b9b9a45790bc9343c4afe0b14e] | committer: Michael Niedermayer

Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54d985db847bb3b9b9a45790bc9343c4afe0b14e
---