[FFmpeg-cvslog] Merge commit '5ba83e90919cdeef38e2b5343b48f3f367292564' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  3 00:57:23 2013 +0200| [30394adc448276b1e8acf0161131c78cf41712e7] | committer: Michael Niedermayer

Merge commit '5ba83e90919cdeef38e2b5343b48f3f367292564' into release/1.1

* commit '5ba83e90919cdeef38e2b5343b48f3f367292564':
  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=30394adc448276b1e8acf0161131c78cf41712e7
---