From 50ea93158d4c480f64069e8bd1da388486dcf4ba Mon Sep 17 00:00:00 2001 From: Derek Buitenhuis Date: Wed, 2 Oct 2013 14:46:26 +0000 Subject: Add libx265 encoder Signed-off-by: Derek Buitenhuis --- doc/general.texi | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'doc/general.texi') diff --git a/doc/general.texi b/doc/general.texi index 5f9500eaac..bb2fcf3abe 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -101,6 +101,20 @@ x264 is under the GNU Public License Version 2 or later details), you must upgrade Libav's license to GPL in order to use it. @end float +@section x265 + +Libav 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 @@ -274,7 +288,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 @@ -529,7 +543,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 -- cgit v1.2.3