Merge commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:08:24 +0000 (11:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:08:24 +0000 (11:08 +0200)
commit8d4e934df94e7324d56a13abca22c3cc21f2ac7d
treef5ba66b53aa36eb90e2450647f9b63d7e2cc9ba0
parent107e9e44329aeec082740a50f7a0e906d9544292
parent0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840
Merge commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840'

* commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840':
  wavpack: add an error message to a failure.
  wavpack: return 0 instead of samples count from decoding functions

Conflicts:
libavcodec/wavpack.c

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