summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMohamed Naufal Basheer <naufal11@gmail.com>2011-03-17 23:56:50 +0100
committerKostya Shishkov <kostya.shishkov@gmail.com>2012-07-22 07:58:54 +0200
commit55c3a4f617171ad1138df684cbafa570807bc6a9 (patch)
tree2d393e8da606e645b032bea2cc0057f7edbc38e1 /doc
parent8aac5585fa7e50d899103efaa3aa4b2a774b16b4 (diff)
downloadffmpeg-55c3a4f617171ad1138df684cbafa570807bc6a9.tar.gz
G.723.1 demuxer and decoder
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 38916de79d..f5c62936b7 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -730,6 +730,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 @tab X
@item GSM @tab E @tab X
@tab encoding supported through external library libgsm
@item GSM Microsoft variant @tab E @tab X