Merge commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8'

* commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8':
  doc: Add initial documentation about the OpenH264 encoder wrapper

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/general.texi
index dd19fcc,31972ee..b4c9325
--- 1/doc/general.texi
--- 2/doc/general.texi
+++ b/doc/general.texi
@@@ -108,9 -95,17 +108,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 OpenH264 library for H.264 encoding.
+ @section OpenH264
+ 
++FFmpeg can make use of the OpenH264 library for H.264 encoding.
+ 
+ Go to @url{http://www.openh264.org/} and follow the instructions for
+ installing the library. Then pass @code{--enable-libopenh264} to configure to
+ enable it.
+ 
  @section x264
  
 -Libav can make use of the x264 library for H.264 encoding.
 +FFmpeg can make use of the x264 library for H.264 encoding.
  
  Go to @url{http://www.videolan.org/developers/x264.html} and follow the
  instructions for installing the library. Then pass @code{--enable-libx264} to