diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-07-10 07:55:06 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-07-10 07:55:06 +0000 |
| commit | b576934d7e37f8ca0431bc8df112fd18af4573bf (patch) | |
| tree | 6bbfc1addfbc9d46915ba47928f4b16f7e757f85 /doc/general.texi | |
| parent | a6f8f11b9b67d352f51addbe090063058a55c1f7 (diff) | |
| download | ffmpeg-streaming-b576934d7e37f8ca0431bc8df112fd18af4573bf.zip ffmpeg-streaming-b576934d7e37f8ca0431bc8df112fd18af4573bf.tar.gz | |
Add native GSM 06.10 audio decoder.
Originally committed as revision 24158 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/general.texi b/doc/general.texi index 471819e..3a1fb7c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -589,10 +589,10 @@ following image formats are supported: @item Enhanced AC-3 @tab @tab X @item FLAC (Free Lossless Audio Codec) @tab X @tab IX @item G.729 @tab @tab X -@item GSM @tab E @tab E - @tab supported through external library libgsm -@item GSM Microsoft variant @tab E @tab E - @tab supported through external library libgsm +@item GSM @tab E @tab X + @tab encoding supported through external library libgsm +@item GSM Microsoft variant @tab E @tab X + @tab encoding supported through external library libgsm @item IMC (Intel Music Coder) @tab @tab X @item MACE (Macintosh Audio Compression/Expansion) 3:1 @tab @tab X @item MACE (Macintosh Audio Compression/Expansion) 6:1 @tab @tab X |
