Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:25:52 +0000 (02:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:26:14 +0000 (02:26 +0100)
commitdc84cf241cccf440dbad2e3bf31784be7ff1d0f6
tree65f16e4ed56413c3ad92669dd53f0504ca5d45cf
parent206ca5c7c820a70f227e7efb8bcf0e419c60b7d9
parent32701252af65014bb68194bb61d67ec1882ae75d
Merge commit '32701252af65014bb68194bb61d67ec1882ae75d' into release/2.4

* commit '32701252af65014bb68194bb61d67ec1882ae75d':
  xwma: Do not leak on failure path

Conflicts:
libavformat/xwma.c

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