Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:36:20 +0000 (05:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:36:20 +0000 (05:36 +0100)
commit8ccfafa7b41b8239cfbbaa5dfd8eea8a300c64be
treec787802f60916e7a7ea2b2413e22c5546cb712e9
parent8c9a23833daa88bdf08b7e7fbf3a64ab689ad373
parent596b5c488fa1d40f114a64d3b73e1863cab073fb
Merge commit '596b5c488fa1d40f114a64d3b73e1863cab073fb'

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

Conflicts:
libavcodec/wma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wma.c