Tele-typewriter demuxer

[ffmpeg] / doc / general.texi

diff --git a/doc/general.texi b/doc/general.texi
index 561a8f12f64d58cec79a00943d0ebfc4d3585326..e96f88d799f0372b8ef9f426b0ed622d8cfd25b2 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -228,6 +228,7 @@ library:
 @item Sony Wave64 (W64)         @tab   @tab X
 @item SoX native format         @tab X @tab X
 @item SUN AU format             @tab X @tab X
+@item Text files                @tab   @tab X
 @item THP                       @tab   @tab X
     @tab Used on the Nintendo GameCube.
 @item Tiertex Limited SEQ       @tab   @tab X
@@ -316,6 +317,7 @@ following image formats are supported:
     @tab Used in games like Mad Dog McCree.
 @item AMV Video              @tab     @tab  X
     @tab Used in Chinese MP3 players.
+@item ANSI/ASCII art         @tab     @tab  X
 @item Apple MJPEG-B          @tab     @tab  X
 @item Apple QuickDraw        @tab     @tab  X
     @tab fourcc: qdrw
@@ -589,10 +591,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
@@ -782,6 +784,12 @@ bash directly to work around this:
 bash ./configure
 @end example
 
+@subsection Darwin (MacOS X, iPhone)
+
+MacOS X on PowerPC or ARM (iPhone) requires a preprocessor from
+@url{http://github.com/yuvi/gas-preprocessor} to build the optimized
+assembler functions.
+
 @section Windows
 
 To get help and instructions for building FFmpeg under Windows, check out