diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 17:12:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-08 17:13:38 +0100 |
| commit | de8f70b8e02dd0b036c5bd0b219dd495de976b58 (patch) | |
| tree | 9a45a3ab930baa205a9cfc191c4fbc187724af6e /doc/general.texi | |
| parent | 26ac6d543598f17ceb6771bce08a00291e62a4ef (diff) | |
| parent | 71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8 (diff) | |
| download | ffmpeg-de8f70b8e02dd0b036c5bd0b219dd495de976b58.tar.gz | |
Merge commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8'
* commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8':
doc: Add initial documentation about the OpenH264 encoder wrapper
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index dd19fcc101..b4c9325821 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -108,6 +108,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 + +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 FFmpeg can make use of the x264 library for H.264 encoding. @@ -653,7 +661,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 |