aboutsummaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-09-25 17:57:58 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-09-25 17:57:58 +0200
commit9b3df9b6d364cbf15dd273095fea88fba39bb423 (patch)
tree87bb516d32159e5350635409503f7ca245d1209d /doc/general.texi
parente8b8b038d043bc48fa32a42222f2e9d2658024c6 (diff)
downloadffmpeg-9b3df9b6d364cbf15dd273095fea88fba39bb423.tar.gz
G.729 decoding is supported.
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index aaf826b9d2..9e97366541 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -45,6 +45,8 @@ library:
@item 4xm @tab @tab X
@tab 4X Technologies format, used in some games.
@item 8088flex TMV @tab @tab X
+@item ACT Voice @tab @tab X
+ @tab contains G.729 audio
@item Adobe Filmstrip @tab X @tab X
@item Audio IFF (AIFF) @tab X @tab X
@item American Laser Games MM @tab @tab X
@@ -104,6 +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.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
@@ -633,6 +636,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.729 @tab @tab X
@item GSM @tab E @tab X
@tab encoding supported through external library libgsm
@item GSM Microsoft variant @tab E @tab X