[FFmpeg-cvslog] Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 11:35:02 2013 +0200| [288e3fdfd3ab65ad871377be53a9651e3faa7ef6] | committer: Michael Niedermayer

Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99'

* commit '35596bd4f4d3c39eed838cf3a2613817d62dda99':
  wavpack: remove a useless parameter from wavpack_decode_block().

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

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