[FFmpeg-cvslog] Merge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 02:43:02 2015 +0200| [1dc58965fd0f430c6020622842ff174feb352a7f] | committer: Michael Niedermayer

Merge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1'

* commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1':
  wma: Check memory allocation

See: 8559a714155a7bc79d4802558f509e211379a8a0
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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