Merge commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d'

* commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d':
  doc: Add libxavs section

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc doc/general.texi
index b489762,d232300..45a4cba
--- 1/doc/general.texi
--- 2/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.
  
 -Libav can make use of the libxavs library for Xavs encoding.
+ @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
  
 -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