diff options
author | Michael Bradshaw <mbradshaw@sorensonmedia.com> | 2012-08-12 10:29:36 -0600 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-14 16:54:25 +0200 |
commit | a22c996a851fbfd53f075838697759a18bb2f71a (patch) | |
tree | 784274d954a746675d1aa58f708addcd6fd1d455 /doc/general.texi | |
parent | aec9390a9d38014615d569ecaf392b22f693e4b6 (diff) | |
download | ffmpeg-a22c996a851fbfd53f075838697759a18bb2f71a.tar.gz |
Add ICO muxer
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-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 f505173fac..9a224d823d 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -212,7 +212,7 @@ library: @tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley playout servers. @item iCEDraw File @tab @tab X -@item ICO @tab @tab X +@item ICO @tab X @tab X @tab Microsoft Windows ICO @item id Quake II CIN video @tab @tab X @item id RoQ @tab X @tab X |