Merge commit '528daa399018af74d52192eb1861d2b59d256111'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:02:22 +0000 (11:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:02:27 +0000 (11:02 +0200)
* commit '528daa399018af74d52192eb1861d2b59d256111':
  wavpack: switch to planar output

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

Simple merge