Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 08:19:20 +0000 (10:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 May 2013 08:40:42 +0000 (10:40 +0200)
commitd9cde3976c194688a1f7d16dcb4671eb11422876
treeeebba4a91da9261f4cdbb58dbd45b344c3aa0164
parent53015bb3b340885d576af87afd20479ecb126bf4
parent2d2d6a4883479403798f4ed46941d5b365823570
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@gmx.at>
Changelog
libavformat/Makefile
libavformat/apetag.c
libavformat/apetag.h
libavformat/matroskaenc.c
libavformat/version.h
libavformat/wvenc.c
tests/Makefile
tests/fate/wavpack.mak