[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  4 10:33:50 2013 +0200| [23a7c32a7ade12044c600aa48966829c53dcc836] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wav: return meaningful errors

Conflicts:
	libavformat/wavdec.c

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

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