Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 20:30:01 +0000 (21:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 20:30:47 +0000 (21:30 +0100)
commit15ed7ca437a89796759390956f117555e703043e
tree3558a4a230d438098aa8868e91a7c87daa70d8d2
parent5af0a701a1c0356fd1a79671de1cf06974e78d76
parentfd9badd3cb3b60f5c54dcea35523e1ecca2f67a6
Merge commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6'

* commit 'fd9badd3cb3b60f5c54dcea35523e1ecca2f67a6':
  xwma: Do not leak on failure path

Conflicts:
libavformat/xwma.c

See: 375a0c03a9a401a328a94b3d9f5338ab1524f7ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/xwma.c