[FFmpeg-cvslog] Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 05:36:20 2014 +0100| [8ccfafa7b41b8239cfbbaa5dfd8eea8a300c64be] | committer: Michael Niedermayer

Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'

* commit '596b5c488fa1d40f114a64d3b73e1863cab073fb':
  wma: check memory allocations and propagate errors

Conflicts:
	libavcodec/wma.c

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

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