[FFmpeg-cvslog] doc: Add initial documentation about the OpenH264 encoder wrapper

Martin Storsjö git at videolan.org
Thu Jan 8 17:27:05 CET 2015


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Jan  8 00:02:05 2015 +0200| [71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8] | committer: Martin Storsjö

doc: Add initial documentation about the OpenH264 encoder wrapper

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8
---

 doc/general.texi |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/general.texi b/doc/general.texi
index ae59941..31972ee 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -95,6 +95,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.
 
+ at section OpenH264
+
+Libav 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.
@@ -593,7 +601,7 @@ following image formats are supported:
 @item H.263 / H.263-1996     @tab  X  @tab  X
 @item H.263+ / H.263-1998 / H.263 version 2  @tab  X  @tab  X
 @item H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10  @tab  E  @tab  X
-    @tab encoding supported through external library libx264
+    @tab encoding supported through external library libx264 and OpenH264
 @item HEVC                   @tab  X  @tab  X
     @tab encoding supported through the external library libx265
 @item HNM version 4          @tab     @tab  X



More information about the ffmpeg-cvslog mailing list