diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:03:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 21:09:17 +0100 |
| commit | f392949f1ac799ad1d7c1cda66e41c1670022d5a (patch) | |
| tree | e3b97d59c99dfc21cf92abb7b71305f4e59f408a /doc/general.texi | |
| parent | 68014c6ed98b5c90f4dc211429dd269ac727be4b (diff) | |
| parent | ae17878fb2ab100264226c84c58f5b95a703312f (diff) | |
| download | ffmpeg-f392949f1ac799ad1d7c1cda66e41c1670022d5a.tar.gz | |
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others
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 47fb784cc3..cecf426f9f 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -494,8 +494,8 @@ following image formats are supported: @item animated GIF @tab X @tab X @item BMP @tab X @tab X @tab Microsoft BMP image -@item PIX @tab @tab X - @tab PIX is an image format used in the Argonaut BRender engine. +@item BRender PIX @tab @tab X + @tab Argonaut BRender 3D engine image format. @item DPX @tab X @tab X @tab Digital Picture Exchange @item EXR @tab @tab X |