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)
* commit '72dee5f40b236c5eb9e68df39df80c68392269e3':
  wavpack: don't set sample format in init.

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

Simple merge