Merge commit '72dee5f40b236c5eb9e68df39df80c68392269e3'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:41:33 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:41:38 +0000 (11:41 +0200)
commitaa6cf4c1b050a387f99c1545a8f8029095da1cce
tree8668d447c0aaecd16fb17b75600401f5a5c08d9b
parent288e3fdfd3ab65ad871377be53a9651e3faa7ef6
parent72dee5f40b236c5eb9e68df39df80c68392269e3
Merge commit '72dee5f40b236c5eb9e68df39df80c68392269e3'

* commit '72dee5f40b236c5eb9e68df39df80c68392269e3':
  wavpack: don't set sample format in init.

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