diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2013-10-02 14:46:26 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2014-02-12 13:12:22 +0000 |
| commit | bb6b1731eba2fac424ff8ad3003fe58b308debd1 (patch) | |
| tree | 8f350385c939c7d284d314398e62a0d18499936c /doc/general.texi | |
| parent | b6c0f07d5a11eea3df291eff4e0deae903b094bd (diff) | |
| download | ffmpeg-bb6b1731eba2fac424ff8ad3003fe58b308debd1.tar.gz | |
Add libx265 encoder
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 359ac46766..079b3ff9d2 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -122,6 +122,20 @@ x264 is under the GNU Public License Version 2 or later details), you must upgrade FFmpeg's license to GPL in order to use it. @end float +@section x265 + +FFmpeg can make use of the x265 library for HEVC encoding. + +Go to @url{http://x265.org/developers.html} and follow the instructions +for installing the library. Then pass @code{--enable-libx265} to configure +to enable it. + +@float note +x265 is under the GNU Public License Version 2 or later +(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for +details), you must upgrade FFmpeg's license to GPL in order to use it. +@end float + @section libilbc iLBC is a narrowband speech codec that has been made freely available @@ -342,7 +356,7 @@ library: @item raw H.261 @tab X @tab X @item raw H.263 @tab X @tab X @item raw H.264 @tab X @tab X -@item raw HEVC @tab @tab X +@item raw HEVC @tab X @tab X @item raw Ingenient MJPEG @tab @tab X @item raw MJPEG @tab X @tab X @item raw MLP @tab @tab X @@ -612,7 +626,8 @@ following image formats are supported: @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 -@item HEVC @tab @tab X +@item HEVC @tab X @tab X + @tab encoding supported through the external library libx265 @item HNM version 4 @tab @tab X @item HuffYUV @tab X @tab X @item HuffYUV FFmpeg variant @tab X @tab X |