[FFmpeg-cvslog] Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 10:19:20 2013 +0200| [d9cde3976c194688a1f7d16dcb4671eb11422876] | committer: Michael Niedermayer

Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'

* commit '2d2d6a4883479403798f4ed46941d5b365823570':
  lavf: add a raw WavPack muxer.
  apetag: add support for writing APE tags
  matroskaenc: support muxing WavPack

Conflicts:
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/apetag.h
	libavformat/version.h
	libavformat/wvenc.c

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

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