summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStefan Gehrer <stefan.gehrer@gmx.de>2009-01-17 20:08:43 +0000
committerStefan Gehrer <stefan.gehrer@gmx.de>2009-01-17 20:08:43 +0000
commit055dc116fcf75f7f38c64b689ebda7480a7da8c2 (patch)
treec6b232602cbfb4b536f0f46b194fa21e3bdc80a1 /doc
parent8a569fee99eba28d3e993182c89a797c455a3bd6 (diff)
added demuxer for FunCom ISS audio files,
extended ADPCM decoder by ISS specific IMA variant Originally committed as revision 16658 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index b594fe157c..17d2cd5cb9 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -74,6 +74,8 @@ library:
@tab .fli/.flc files
@item FLV @tab X @tab X
@tab Macromedia Flash video files
+@item FunCom ISS @tab @tab X
+ @tab Audio format used in various games from FunCom like The Longest Journey.
@item GXF @tab X @tab X
@tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley
playout servers.
@@ -385,6 +387,8 @@ following image formats are supported:
@item Intel Music Coder @tab @tab X
@item Interplay MVE DPCM @tab @tab X
@tab Used in various Interplay computer games.
+@item ISS IMA ADPCM @tab @tab X
+ @tab Used in FunCom games.
@item MAXIS EA ADPCM @tab @tab X
@tab Used in Sim City 3000.
@item Microsoft ADPCM @tab X @tab X