Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:35:02 +0000 (11:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:36:26 +0000 (11:36 +0200)
commit288e3fdfd3ab65ad871377be53a9651e3faa7ef6
treec8c15cea29190cfae5586ecc0ba72718da89f708
parentf5dfc3515780a4b59d82138d098cb8a4ae50cc98
parent35596bd4f4d3c39eed838cf3a2613817d62dda99
Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99'

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

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