diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:10:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:10:28 +0100 |
| commit | 12ab07be447264b107b18bc49bb9e06be072330f (patch) | |
| tree | 7efd220c82eba3dc7779839806ac5c1b080aa520 /doc/general.texi | |
| parent | 61b5ef7754132c43e6db1a273066e82c469fa39c (diff) | |
| parent | e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b (diff) | |
| download | ffmpeg-12ab07be447264b107b18bc49bb9e06be072330f.tar.gz | |
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
Alias PIX image encoder and decoder
Conflicts:
Changelog
libavcodec/allcodecs.c
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 064e4a9bb9..47fb784cc3 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -489,6 +489,8 @@ following image formats are supported: @item Name @tab Encoding @tab Decoding @tab Comments @item .Y.U.V @tab X @tab X @tab one raw file per component +@item Alias PIX @tab X @tab X + @tab Alias/Wavefront PIX image format @item animated GIF @tab X @tab X @item BMP @tab X @tab X @tab Microsoft BMP image |