[FFmpeg-cvslog] Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 19 10:27:11 2013 +0200| [3e3514bce269f54b44773c72df3a12cbf4d8aa5b] | committer: Michael Niedermayer

Merge commit 'ed50673066956d6f2201a57c3254569f2ab08d9d'

* commit 'ed50673066956d6f2201a57c3254569f2ab08d9d':
  wavpack: validate samples size parsed in wavpack_decode_block

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e3514bce269f54b44773c72df3a12cbf4d8aa5b
---