aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-10 10:49:16 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-10 10:49:16 +0200
commit3c8862a5677f8a3eb30d71577807ba8f84ed46dd (patch)
tree1c36c1f5efb638cc49e5b981d39d6a64e721a679 /doc/general.texi
parent0b3e070035aa23e7a2d0902d406c9340c0d3301c (diff)
downloadffmpeg-3c8862a5677f8a3eb30d71577807ba8f84ed46dd.tar.gz
Add G.723.1 to the documentation.
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 1b3eb6edfc..65f9efe3d3 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -106,7 +106,7 @@ library:
@item framecrc testing format @tab X @tab
@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.723.1 @tab X @tab X
@item G.729 BIT @tab X @tab X
@item GIF Animation @tab X @tab
@item GXF @tab X @tab X
@@ -638,6 +638,7 @@ following image formats are supported:
@item DV audio @tab @tab X
@item Enhanced AC-3 @tab X @tab X
@item FLAC (Free Lossless Audio Codec) @tab X @tab IX
+@item G.723.1 @tab X @tab X
@item G.729 @tab @tab X
@item GSM @tab E @tab X
@tab encoding supported through external library libgsm