Merge commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 13:41:18 +0000 (14:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 13:44:14 +0000 (14:44 +0100)
commit11d62fc9bea79db02f7b44632992f4a10448ec6a
treea82f1f14e8a84b195cba4f2309e72b5a79fbd776
parent019b378d90e04b77e1ae075696eafc3f44d21e27
parent37cb3b180a1dc3d6f123f68e0806585ebc2578b6
Merge commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6'

* commit '37cb3b180a1dc3d6f123f68e0806585ebc2578b6':
  matroskadec: request a read buffer for the wav header

See: d0b450457b3aeb8c234b0b0a987db55d3485326b

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