[FFmpeg-cvslog] Merge commit '8c34558131d846d2b10389564caadaa206372fd4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 19 10:22:05 2013 +0200| [2ad415cfa42069cad92803f2bc047b4311aa3c70] | committer: Michael Niedermayer

Merge commit '8c34558131d846d2b10389564caadaa206372fd4'

* commit '8c34558131d846d2b10389564caadaa206372fd4':
  wavpack: return meaningful errors

Conflicts:
	libavcodec/wavpack.c

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

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