[FFmpeg-cvslog] Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

[Michael Niedermayer]

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

Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
	Changelog
	libavformat/version.h

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

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