summaryrefslogtreecommitdiff
path: root/doc/ffmpeg-doc.texi
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2004-07-01 00:45:16 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-07-01 00:45:16 +0000
commitf6fa7a6cf5e0f06d729f617615631bc6aaf17c99 (patch)
tree1f7a1782dbf7983201333dcde186093cd55848f2 /doc/ffmpeg-doc.texi
parent5d79ddc9b1c4b2686375bf5e9d5bbc8e492e75e6 (diff)
Ffmpeg supports AAC doesn't it patch by (Benjamin Larsson <banan at student dot ltu dot se>)
Originally committed as revision 3280 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
-rw-r--r--doc/ffmpeg-doc.texi2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 881cd4b692..e2bf3d3158 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -774,6 +774,8 @@ solutions.
@item Vorbis @tab X @tab X
@tab supported through the external library libvorbis
@item WMA V1/V2 @tab @tab X
+@item AAC @tab X @tab X
+@tab supported through the external library libfaac/libfaad
@item Microsoft ADPCM @tab X @tab X
@item MS IMA ADPCM @tab X @tab X
@item QT IMA ADPCM @tab @tab X