diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:39:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 10:46:39 +0100 |
| commit | a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07 (patch) | |
| tree | 01531bd775ded92bdfe25952a27c83655d7fc1c7 /doc/general.texi | |
| parent | fc5fe4804fd2ee9a29de502e9431b12d027c0c89 (diff) | |
| parent | 9af7a8523a6bb517834ebed36093bdab11a8b38e (diff) | |
| download | ffmpeg-a2bfee36b70bc9a5dd0a5a1cef36ca32bc1fba07.tar.gz | |
Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
HNM4/HNM4A demuxer & video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 647c5e20ee..be2f85f0a4 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -249,6 +249,8 @@ library: @item GXF @tab X @tab X @tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley playout servers. +@item HNM @tab @tab X + @tab Only version 4 supported, used in some games from Cryo Interactive @item iCEDraw File @tab @tab X @item ICO @tab X @tab X @tab Microsoft Windows ICO @@ -607,6 +609,7 @@ following image formats are supported: @item H.263+ / H.263-1998 / H.263 version 2 @tab X @tab X @item H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 @tab E @tab X @tab encoding supported through external library libx264 +@item HNM version 4 @tab @tab X @item HuffYUV @tab X @tab X @item HuffYUV FFmpeg variant @tab X @tab X @item IBM Ultimotion @tab @tab X |