Merge commit 'd1bec4be2207738669874e02605e879ea9620974'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:28:18 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:28:22 +0000 (11:28 +0200)
* commit 'd1bec4be2207738669874e02605e879ea9620974':
  wavpack: return an error on 0-sized blocks

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

Simple merge