aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2011-12-04 17:45:24 +1100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-04 16:44:20 +0100
commitba8410cb446cae58d1fa1d9e3891a67db92d4e14 (patch)
tree25f48d75701a5b55db235a4da450f81a1ff9ced7 /doc/general.texi
parentb4425f26bb1e11f8e885abf78b88105c396888d7 (diff)
downloadffmpeg-ba8410cb446cae58d1fa1d9e3891a67db92d4e14.tar.gz
Microsoft Windows ICO demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 04ca71db91..1b720f51c7 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -125,6 +125,8 @@ 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
+ @tab Microsoft Windows ICO
@item id Quake II CIN video @tab @tab X
@item id RoQ @tab X @tab X
@tab Used in Quake III, Jedi Knight 2 and other computer games.