summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2009-09-22 17:28:03 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2009-09-22 17:28:03 +0000
commit61dc238b45245c9e646d47ca8f51c089a1dfb913 (patch)
tree0502cc3fa46735226751198fc2e0eeb51dbfe83d /doc
parente704b012f23044f5e1e95f5237c6c541b57bb625 (diff)
Hook up the MD studio demuxer and Atrac1 decoder.
Originally committed as revision 19969 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index d0d472e6d5..dc8620750a 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -107,6 +107,7 @@ library:
@item Matroska audio @tab X @tab
@item MAXIS XA @tab @tab X
@tab Used in Sim City 3000; file extension .xa.
+@item MD Studio @tab @tab X
@item Monkey's Audio @tab @tab X
@item Motion Pixels MVI @tab @tab X
@item MOV/QuickTime/MP4 @tab X @tab X
@@ -532,6 +533,7 @@ following image formats are supported:
@tab decoding supported through external library libopencore-amrwb
@item Apple lossless audio @tab X @tab X
@tab QuickTime fourcc 'alac'
+@item Atrac 1 @tab @tab X
@item Atrac 3 @tab @tab X
@item Delphine Software International CIN audio @tab @tab X
@tab Codec used in Delphine Software International games.