aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2008-03-19 18:51:20 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2008-03-19 18:51:20 +0000
commit10cac9f9c24247c045a2f74ce64690b7e45cdfca (patch)
treef7a021b452dd48d586adec1c0e7da539909287fb /doc
parent7e6ca34f2742515fee09a2af0af627e8fcc0cf27 (diff)
downloadffmpeg-10cac9f9c24247c045a2f74ce64690b7e45cdfca.tar.gz
Add Mimic and MSN TCP Webcam streams to documentation.
Originally committed as revision 12507 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 7c38198d0e..3a09d34a12 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -129,6 +129,8 @@ different game cutscenes repacked for use with ScummVM.
@tab Used by Linux Media Labs MPEG-4 PCI boards
@item PVA @tab @tab X
@tab Used by TechnoTrend DVB PCI boards
+@item MSN TCP Webcam @tab @tab X
+@tab Used by MSN Messenger Webcam streams.
@end multitable
@code{X} means that encoding (resp. decoding) is supported.
@@ -246,6 +248,7 @@ following image formats are supported:
@item Bethsoft VID @tab @tab X @tab Used in some games from Bethesda Softworks.
@item Renderware TXD @tab @tab X @tab Texture dictionaries used by the Renderware Engine.
@item AMV @tab @tab X @tab Used in Chinese MP3 players.
+@item Mimic @tab @tab X @tab Used in MSN Messenger Webcam streams.
@end multitable
@code{X} means that encoding (resp. decoding) is supported.