diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
commit | 6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd (patch) | |
tree | 6d894ef0fb24a5394ce4341e2404d6668f8d23f1 /doc/general.texi | |
parent | 9b195dd5793edb88a72d53cb080c2216e91a5849 (diff) | |
parent | be7c323176e2e5fcf30e3d2ff20975b2f936811b (diff) |
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
Add a libwebp encoder
Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
-rw-r--r-- | doc/general.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index a3221d54fb..0ac6455979 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -491,8 +491,8 @@ following image formats are supported: @tab YUV, JPEG and some extension is not supported yet. @item Truevision Targa @tab X @tab X @tab Targa (.TGA) image format -@item WebP @tab @tab X - @tab WebP image format +@item WebP @tab E @tab X + @tab WebP image format, encoding supported through external library libwebp @item XBM @tab X @tab X @tab X BitMap image format @item XFace @tab X @tab X |