aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDaniel Verkamp <daniel@drv.nu>2009-03-02 00:29:24 +0000
committerDiego Biurrun <diego@biurrun.de>2009-03-02 00:29:24 +0000
commitf2937cc627202daf17f4380cc076a8d3c077fd14 (patch)
treecf4571cd8219392a5cf8069b62185e6afa907890 /doc
parent314511ab4d7b9428c7c4a6a797a9e18faf1388f9 (diff)
downloadffmpeg-f2937cc627202daf17f4380cc076a8d3c077fd14.tar.gz
Add missing image formats, patch by Daniel Verkamp, daniel drv nu.
Originally committed as revision 17701 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 4a76bcfff6..c56ee9d38e 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -237,12 +237,19 @@ following image formats are supported:
@tab one raw file per component
@item animated GIF @tab X @tab X
@tab Only uncompressed GIFs are generated.
+@item BMP @tab X @tab X
+ @tab Microsoft BMP image
@item JPEG @tab X @tab X
@tab Progressive JPEG is not supported.
@item JPEG 2000 @tab @tab E
@tab decoding supported through external library libopenjpeg
+@item JPEG-LS @tab X @tab X
+@item LJPEG @tab X @tab
+ @tab Lossless JPEG
@item PAM @tab X @tab X
@tab PAM is a PNM extension with alpha support.
+@item PBM @tab X @tab X
+ @tab Portable BitMap image
@item PCX @tab @tab X
@tab PC Paintbrush
@item PGM @tab X @tab X