* commit '31c54711':
  lavf: split wav muxer and demuxer into separate files.

Conflicts:
	libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>