[FFmpeg-cvslog] Merge commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 11:08:24 2013 +0200| [8d4e934df94e7324d56a13abca22c3cc21f2ac7d] | committer: Michael Niedermayer

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 at gmx.at>

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