diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2014-03-07 04:55:48 +0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-03-07 17:32:55 +0400 |
| commit | d5254230068e196a2496618c0d89cdfbc41f7478 (patch) | |
| tree | 2b44535a12ff71b392aab21e1cd8a16ab5355d33 /doc/general.texi | |
| parent | 4b476e6aa4b830f919cf3c67ba2caa039ff285b9 (diff) | |
Revert "Add libx265 encoder"
cf. the discussion following
https://lists.libav.org/pipermail/libav-devel/2014-March/056894.html
This reverts commit 50ea93158d4c480f64069e8bd1da388486dcf4ba.
Conflicts:
doc/general.texi
libavcodec/version.h
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/doc/general.texi b/doc/general.texi index 6bc7fdaf4d..5f9500eaac 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -101,20 +101,6 @@ 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 Libav'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 @@ -288,7 +274,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 X @tab X +@item raw HEVC @tab @tab X @item raw Ingenient MJPEG @tab @tab X @item raw MJPEG @tab X @tab X @item raw MLP @tab @tab X @@ -543,8 +529,7 @@ 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 X @tab X - @tab encoding supported through the external library libx265 +@item HEVC @tab @tab X @item HNM version 4 @tab @tab X @item HuffYUV @tab X @tab X @item HuffYUV FFmpeg variant @tab X @tab X |