]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Add GSM into list of supported audio codecs.
authordiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 25 Oct 2008 08:44:31 +0000 (08:44 +0000)
committerdiego <diego@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 25 Oct 2008 08:44:31 +0000 (08:44 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15700 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

doc/general.texi

index 366e881a4120dbf84daae04bc7292cbc87015e02..5f27bac5e53ce39dbd4ef39edff9c028aab8f3a0 100644 (file)
@@ -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