Corrections to channel coupling code to attain conformance for appropriate

[ffmpeg] / doc / general.texi

diff --git a/doc/general.texi b/doc/general.texi
index 0944654cc47e1bbe06578593b1689e013e7b8d4b..a6aa58242fbc60958b447209d998cb0a621595c7 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -40,7 +40,7 @@ FFmpeg supports the following file formats through the @code{libavformat}
 library:
 
 @multitable @columnfractions .4 .1 .1 .4
-@item Supported File Format @tab Encoding @tab Decoding @tab Comments
+@item Name @tab Encoding @tab Decoding @tab Comments
 @item 4xm                       @tab   @tab X
     @tab 4X Technologies format, used in some games.
 @item ADTS AAC audio            @tab X @tab X
@@ -104,7 +104,7 @@ library:
     @tab MPEG-4 is a variant of QuickTime.
 @item MSN TCP webcam            @tab   @tab X
     @tab Used by MSN Messenger webcam streams.
-@item MXF                       @tab   @tab X
+@item MXF                       @tab X @tab X
     @tab Material eXchange Format SMPTE 377M, used by D-Cinema, broadcast industry.
 @item Nullsoft Video            @tab   @tab X
 @item NUT                       @tab X @tab X
@@ -119,7 +119,7 @@ library:
 @item raw MJPEG                 @tab X @tab X
 @item raw MPEG video            @tab X @tab X
 @item raw MPEG-4 video          @tab X @tab X
-@item raw PCM 8/16/32 bits, mu-law/A-law @tab X  @tab  X
+@item raw PCM 8/16/32 bits, 32/64-bit floating point, mu-law/A-law @tab X  @tab  X
 @item raw Shorten audio         @tab    @tab  X
 @item RealMedia                 @tab X @tab X
 @item RL2                       @tab   @tab X
@@ -154,7 +154,7 @@ FFmpeg can read and write images for each frame of a video sequence. The
 following image formats are supported:
 
 @multitable @columnfractions .4 .1 .1 .4
-@item Supported Image Format @tab Encoding @tab Decoding @tab Comments
+@item Name @tab Encoding @tab Decoding @tab Comments
 @item .Y.U.V       @tab X @tab X @tab one raw file per component
 @item animated GIF @tab X @tab X @tab Only uncompressed GIFs are generated.
 @item JPEG         @tab X @tab X @tab Progressive JPEG is not supported.
@@ -175,7 +175,7 @@ following image formats are supported:
 @section Video Codecs
 
 @multitable @columnfractions .4 .1 .1 .4
-@item Supported Codec @tab Encoding @tab Decoding @tab Comments
+@item Name @tab Encoding @tab Decoding @tab Comments
 @item 4X Video               @tab     @tab  X
     @tab Used in certain computer games.
 @item American Laser Games Video  @tab    @tab X
@@ -333,20 +333,19 @@ following image formats are supported:
 @section Audio Codecs
 
 @multitable @columnfractions .4 .1 .1 .1 .7
-@item Supported Codec @tab Encoding @tab Decoding @tab Comments
+@item Name @tab Encoding @tab Decoding @tab Comments
 @item 4X IMA ADPCM           @tab     @tab  X
 @item 8SVX audio             @tab     @tab  X
 @item AAC                    @tab  X  @tab  X
-    @tab Supported through the external library libfaac/libfaad.
+    @tab Encoding is supported through the external library libfaac.
 @item AC-3                   @tab IX  @tab IX
-    @tab liba52 can be used alternatively for decoding.
 @item AMR-NB                 @tab  X  @tab  X
     @tab Supported through an external library.
 @item AMR-WB                 @tab  X  @tab  X
     @tab Supported through an external library.
 @item AMV IMA ADPCM          @tab     @tab  X
     @tab Used in AMV files
-@item Apple lossless audio   @tab     @tab  X
+@item Apple lossless audio   @tab  X  @tab  X
     @tab QuickTime fourcc 'alac'
 @item Apple MACE 3           @tab     @tab  X
 @item Apple MACE 6           @tab     @tab  X
@@ -367,11 +366,8 @@ following image formats are supported:
 @item DV audio               @tab     @tab  X
 @item Electronic Arts ADPCM  @tab     @tab  X
     @tab Used in various EA titles.
-@item Sonic                  @tab  X  @tab  X
-    @tab experimental codec
-@item Sonic lossless         @tab  X  @tab  X
-    @tab experimental codec
-@item FLAC lossless audio    @tab  X  @tab  X
+@item Enhanced AC-3          @tab     @tab  X
+@item FLAC lossless audio    @tab IX  @tab  X
 @item G.726  ADPCM           @tab  X  @tab  X
 @item id RoQ DPCM            @tab  X  @tab  X
     @tab Used in Quake III, Jedi Knight 2, other computer games.
@@ -391,7 +387,7 @@ following image formats are supported:
 @item MS IMA ADPCM           @tab  X  @tab  X
 @item Musepack               @tab     @tab  X
     @tab SV7 and SV8 are supported.
-@item Nellymoser ASAO        @tab     @tab  X
+@item Nellymoser ASAO        @tab  X  @tab  X
 @item Qdesign QDM2           @tab     @tab  X
     @tab There are still some distortions.
 @item QT IMA ADPCM           @tab  X  @tab  X
@@ -399,8 +395,8 @@ following image formats are supported:
     @tab Real 14400 bit/s codec
 @item RA288                  @tab     @tab  X
     @tab Real 28800 bit/s codec
-@item RADnet                 @tab  X  @tab IX
-    @tab real low bitrate AC-3 codec
+@item RADnet                 @tab IX  @tab IX
+    @tab Real low bitrate AC-3 codec
 @item Real COOK              @tab     @tab  X
     @tab All versions except 5.1 are supported.
 @item Shorten                @tab     @tab  X
@@ -409,6 +405,10 @@ following image formats are supported:
 @item Smacker audio          @tab     @tab  X
 @item SMJPEG IMA ADPCM       @tab     @tab  X
     @tab Used in certain Loki game ports.
+@item Sonic                  @tab  X  @tab  X
+    @tab experimental codec
+@item Sonic lossless         @tab  X  @tab  X
+    @tab experimental codec
 @item THP ADPCM              @tab     @tab  X
     @tab Used on the Nintendo GameCube.
 @item True Audio (TTA)       @tab     @tab  X
@@ -437,16 +437,27 @@ BSD make will not build FFmpeg, you need to install and use GNU Make
 
 To get help and instructions for building FFmpeg under Windows, check out
 the FFmpeg Windows Help Forum at
-@url{http://arrozcru.no-ip.org/ffmpeg/}.
+@url{http://ffmpeg.arrozcru.org/}.
 
 @subsection Native Windows compilation
 
 FFmpeg can be built to run natively on Windows using the MinGW tools. Install
-the current versions of MSYS and MinGW from @url{http://www.mingw.org/}. Also
-install the coreutils package, and update to the latest MSYS make (note: not
-mingw32-make). You can find detailed installation
+the latest versions of MSYS and MinGW from @url{http://www.mingw.org/}.
+You can find detailed installation
 instructions in the download section and the FAQ.
 
+FFmpeg does not build out-of-the-box with the packages the automated MinGW
+installer provides. It also requires coreutils to be installed and many other
+packages updated to the latest version. The minimum version for some packages
+are listed below:
+
+@itemize
+@item bash 3.1
+@item msys-make 3.81-2 (note: not mingw32-make)
+@item w32api 3.12
+@item mingw-runtime 3.15
+@end itemize
+
 Within the MSYS shell, configure and make with:
 
 @example
@@ -463,9 +474,6 @@ Notes:
 
 @itemize
 
-@item Use at least bash 3.1. Older versions are known to fail on the
-configure script.
-
 @item In order to compile vhooks, you must have a POSIX-compliant libdl in
 your MinGW system. Get dlfcn-win32 from
 @url{http://code.google.com/p/dlfcn-win32}.