aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-09-23 21:33:29 +0000
committerMartin Storsjö <martin@martin.st>2010-09-23 21:33:29 +0000
commit21e681ba57735bca225f1f903c7e93ffdb0f86ba (patch)
tree0b4f8b750c1958fa754a760fedc4c510ac78503f /doc
parent2efcde73fccaeda948e64d5de4af3eb6205fd1c8 (diff)
downloadffmpeg-21e681ba57735bca225f1f903c7e93ffdb0f86ba.tar.gz
Add a G.722 encoder
Originally committed as revision 25164 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 9a3200f49c..b9953cc1a0 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -536,7 +536,7 @@ following image formats are supported:
@item ADPCM Electronic Arts R2 @tab @tab X
@item ADPCM Electronic Arts R3 @tab @tab X
@item ADPCM Electronic Arts XAS @tab @tab X
-@item ADPCM G.722 @tab @tab X
+@item ADPCM G.722 @tab X @tab X
@item ADPCM G.726 @tab X @tab X
@item ADPCM IMA AMV @tab @tab X
@tab Used in AMV files