diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 09:36:34 +0200 |
| commit | 73d5cf8f43786b3a643d9955e4c6499f5b391b81 (patch) | |
| tree | 8b6435ea549944a7863eda9629341a428a4ccb03 /doc/general.texi | |
| parent | 5d199c3ad985eab4500cbfd2d1146ac70197ceac (diff) | |
| parent | 84d3ff50cd679e0f35f0b7ce2cb2cedd99169959 (diff) | |
| download | ffmpeg-73d5cf8f43786b3a643d9955e4c6499f5b391b81.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add a libwavpack encoder wrapper
Conflicts:
Changelog
doc/encoders.texi
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index 35a49bf121..2be99bda98 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -95,6 +95,14 @@ Go to @url{http://www.webmproject.org/} and follow the instructions for installing the library. Then pass @code{--enable-libvpx} to configure to enable it. +@section libwavpack + +Libav can make use of the libwavpack library for WavPack encoding. + +Go to @url{http://www.wavpack.com/} and follow the instructions for +installing the library. Then pass @code{--enable-libwavpack} to configure to +enable it. + @section x264 FFmpeg can make use of the x264 library for H.264 encoding. @@ -909,7 +917,8 @@ following image formats are supported: @tab Used in LucasArts SMUSH animations. @item Vorbis @tab E @tab X @tab A native but very primitive encoder exists. -@item WavPack @tab @tab X +@item WavPack @tab E @tab X + @tab supported through external library libwavpack @item Westwood Audio (SND1) @tab @tab X @item Windows Media Audio 1 @tab X @tab X @item Windows Media Audio 2 @tab X @tab X |