diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 19:12:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 19:26:46 +0200 |
| commit | e37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573 (patch) | |
| tree | 6d466e4b5f4f4e661031f14453a62ab2b86d0776 /doc/general.texi | |
| parent | 928b5708f94c50e8cb0b982208a2d097b0d588c2 (diff) | |
| parent | 07761294fc3f08e139e8a406ef7d5b63aaf1ecee (diff) | |
| download | ffmpeg-e37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573.tar.gz | |
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
Silicon Graphics RLE 8-bit video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h
See: afa1617b937f3675f74c6351a46c45f8c24d67f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index 313b6f96b3..03e02c8bd8 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -752,11 +752,11 @@ following image formats are supported: @tab Texture dictionaries used by the Renderware Engine. @item RL2 video @tab @tab X @tab used in some games by Entertainment Software Partners -@item SGI RLE 8-bit @tab @tab X @item Sierra VMD video @tab @tab X @tab Used in Sierra VMD files. @item Silicon Graphics Motion Video Compressor 1 (MVC1) @tab @tab X @item Silicon Graphics Motion Video Compressor 2 (MVC2) @tab @tab X +@item Silicon Graphics RLE 8-bit video @tab @tab X @item Smacker video @tab @tab X @tab Video encoding used in Smacker. @item SMPTE VC-1 @tab @tab X |