diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-10-25 08:44:31 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-10-25 08:44:31 +0000 |
| commit | 3f33271aa406e2f59733e3779b50246a3853e4bc (patch) | |
| tree | 0cd0a567033b358785f70dba5604bcb0f8c1b2fc | |
| parent | 360f980b9a8620b4b3bbd71428ee89440ff89227 (diff) | |
| download | ffmpeg-3f33271aa406e2f59733e3779b50246a3853e4bc.tar.gz | |
Add GSM into list of supported audio codecs.
Originally committed as revision 15700 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/general.texi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 366e881a41..5f27bac5e5 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -370,6 +370,10 @@ following image formats are supported: @item Enhanced AC-3 @tab @tab X @item FLAC lossless audio @tab IX @tab X @item G.726 ADPCM @tab X @tab X +@item GSM @tab X @tab X + @tab supported through external library libgsm +@item GSM_MS @tab X @tab X + @tab supported through external library libgsm @item id RoQ DPCM @tab X @tab X @tab Used in Quake III, Jedi Knight 2, other computer games. @item Intel Music Coder @tab @tab X |