From 3f33271aa406e2f59733e3779b50246a3853e4bc Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 25 Oct 2008 08:44:31 +0000 Subject: [PATCH] Add GSM into list of supported audio codecs. Originally committed as revision 15700 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/general.texi | 4 ++++ 1 file changed, 4 insertions(+) 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