ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Mon Apr 3 20:50:03 2017 +0200| [3d34d5c1cf645c0e844c080aa8e04359962ca835] | committer: Clément Bœsch
Merge commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d' * commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d': doc: Add libxavs section Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d34d5c1cf645c0e844c080aa8e04359962ca835 --- doc/general.texi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/general.texi b/doc/general.texi index b489762..45a4cba 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -101,6 +101,14 @@ 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 libxavs + +FFmpeg can make use of the libxavs library for Xavs encoding. + +Go to @url{http://xavs.sf.net/} and follow the instructions for +installing the library. Then pass @code{--enable-libxavs} to configure to +enable it. + @section OpenH264 FFmpeg can make use of the OpenH264 library for H.264 encoding and decoding. ====================================================================== diff --cc doc/general.texi index b489762,d232300..45a4cba --- a/doc/general.texi +++ b/doc/general.texi @@@ -101,9 -95,17 +101,17 @@@ Go to @url{http://www.wavpack.com/} an installing the library. Then pass @code{--enable-libwavpack} to configure to enable it. + @section libxavs + -Libav can make use of the libxavs library for Xavs encoding. ++FFmpeg can make use of the libxavs library for Xavs encoding. + + Go to @url{http://xavs.sf.net/} and follow the instructions for + installing the library. Then pass @code{--enable-libxavs} to configure to + enable it. + @section OpenH264 -Libav can make use of the OpenH264 library for H.264 encoding and decoding. +FFmpeg can make use of the OpenH264 library for H.264 encoding and decoding. Go to @url{http://www.openh264.org/} and follow the instructions for installing the library. Then pass @code{--enable-libopenh264} to configure to _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
