diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-03-02 06:13:54 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-03-02 06:13:54 +0000 |
| commit | ddea12a6b5f1eb8a47f5898aa0aba9ce98a24244 (patch) | |
| tree | e8d039b31fa9fa39e7bee511597aca8be060fa52 /doc | |
| parent | 12dd57fd290346d301eccce6cf1984cc4ac50b6c (diff) | |
| download | ffmpeg-ddea12a6b5f1eb8a47f5898aa0aba9ce98a24244.tar.gz | |
Revert previous removal of PAM, PBM, PGM, PGMYUV and PPM from the list of
supported image formats. Apparently decoding these formats is supported.
Originally committed as revision 17722 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/general.texi b/doc/general.texi index 0a30a96978..c53e1bc710 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -244,19 +244,19 @@ following image formats are supported: @item JPEG-LS @tab X @tab X @item LJPEG @tab X @tab @tab Lossless JPEG -@item PAM @tab X @tab +@item PAM @tab X @tab X @tab PAM is a PNM extension with alpha support. -@item PBM @tab X @tab +@item PBM @tab X @tab X @tab Portable BitMap image @item PCX @tab @tab X @tab PC Paintbrush -@item PGM @tab X @tab +@item PGM @tab X @tab X @tab Portable GrayMap image -@item PGMYUV @tab X @tab +@item PGMYUV @tab X @tab X @tab PGM with U and V components in YUV 4:2:0 @item PNG @tab X @tab X @tab 2/4 bpp not supported yet -@item PPM @tab X @tab +@item PPM @tab X @tab X @tab Portable PixelMap image @item PTX @tab @tab X @tab V.Flash PTX format |