aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-30 01:16:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-30 01:16:30 +0200
commit9714a78bbb376dcbeb4ce29cdefe8442f6d03689 (patch)
tree2c5015204fe3ce438b5f42df8aa0a4401234ce7a /doc/general.texi
parent68bbaac7e54f5b4918357fb2f4d9fd0f5ae1c93c (diff)
downloadffmpeg-9714a78bbb376dcbeb4ce29cdefe8442f6d03689.tar.gz
Revert "general.texi: we dont have a g729 encoder yet"
This reverts commit 84f8aef40c7091274ed399a8aeaa933ea76d9476.
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index efeaa9275a..1b3eb6edfc 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -107,7 +107,7 @@ library:
@item FunCom ISS @tab @tab X
@tab Audio format used in various games from FunCom like The Longest Journey.
@item G.723.1 @tab @tab X
-@item G.729 BIT @tab @tab X
+@item G.729 BIT @tab X @tab X
@item GIF Animation @tab X @tab
@item GXF @tab X @tab X
@tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley