* commit '31c54711cc3f1484af101d629bbb805820d37ad1': lavf: split wav muxer and demuxer into separate files. Conflicts: libavformat/wavdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>