summaryrefslogtreecommitdiff
path: root/doc/general.texi
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-01-08 00:02:05 +0200
committerMartin Storsjö <martin@martin.st>2015-01-08 13:53:15 +0200
commit71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8 (patch)
tree676a04d784e548a787e8ca56cce6b761956cce92 /doc/general.texi
parent5a1addd7c1d8ff218ed4b84f4f02fdb83980094c (diff)
doc: Add initial documentation about the OpenH264 encoder wrapper
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index ae59941bf6..31972ee419 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.
+@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