Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 May 2013 08:55:00 +0000 (10:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 May 2013 08:55:46 +0000 (10:55 +0200)
* qatar/master:
  wavpack: check packet size early

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

Simple merge