[FFmpeg-cvslog] Merge commit '89806691b1c39181c63d95e0fddc30f11e2a7b04'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 04:44:53 2013 +0200| [7a2edcf1c8d46234406083b3a3fdb21cfa28d33e] | committer: Michael Niedermayer

Merge commit '89806691b1c39181c63d95e0fddc30f11e2a7b04'

* commit '89806691b1c39181c63d95e0fddc30f11e2a7b04':
  wavpack: check that all the channels were coded.
  wavpack: check that there aren't too many blocks per packet

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

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