diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 12:19:20 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 12:40:42 +0400 |
commit | d9cde3976c194688a1f7d16dcb4671eb11422876 (patch) | |
tree | eebba4a91da9261f4cdbb58dbd45b344c3aa0164 /Changelog | |
parent | 53015bb3b340885d576af87afd20479ecb126bf4 (diff) | |
parent | 2d2d6a4883479403798f4ed46941d5b365823570 (diff) |
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>
Diffstat (limited to 'Changelog')
-rw-r--r-- | Changelog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -57,6 +57,7 @@ version <next>: - support for slice multithreading in libavfilter - Hald CLUT support (generation and filtering) - VC-1 interlaced B-frame support +- support for WavPack muxing (raw and in Matroska) version 1.2: |