[FFmpeg-cvslog] Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 17 15:36:36 2012 +0200| [df5e089da95bc39b71f9cbee4152636758dc2041] | committer: Michael Niedermayer

Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'

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

Conflicts:
	libavformat/wavdec.c

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

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