update

Originally committed as revision 1236 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 10 insertions, 1 deletions

diff --git a/doc/ffmpeg-doc.html b/doc/ffmpeg-doc.html
index e7aebfc49e..805c58e3ca 100644
--- a/doc/ffmpeg-doc.html
+++ b/doc/ffmpeg-doc.html
@@ -645,6 +645,9 @@ library.
 </TR>
 <TR><TD>DV                     </TD><TD>     </TD><TD>  X</TD>
 
+</TR>
+<TR><TD>Huff YUV               </TD><TD>  X  </TD><TD>  X</TD>
+
 </TR></TABLE>
 
 <P>
@@ -680,6 +683,9 @@ solutions.
 <TR><TD>Vorbis                 </TD><TD>  X   </TD><TD></TD>
 
 </TD><TD> encoding is supported thru the external library libvorbis.
+</TR>
+<TR><TD>WMA V1/V2              </TD><TD>      </TD><TD> X</TD>
+
 </TR></TABLE>
 
 <P>
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 781d8dc68c..bc00c3f1ac 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -362,7 +362,7 @@ library.
 
 @multitable @columnfractions .4 .1 .1 .7
 @item Supported Codec @tab Encoding @tab Decoding @tab Comments
-@item MPEG1 video            @tab  X  @tab  X 
+@item MPEG1 video            @tab  X  @tab  X
 @item MPEG2 video            @tab     @tab  X 
 @item MPEG4                  @tab  X  @tab  X @tab Also known as DIVX4/5
 @item MSMPEG4 V1             @tab  X  @tab  X
@@ -372,6 +372,7 @@ library.
 @item H263(+)                @tab  X  @tab  X @tab Also known as Real Video 1.0
 @item MJPEG                  @tab  X  @tab  X 
 @item DV                     @tab     @tab  X 
+@item Huff YUV               @tab  X  @tab  X
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.
@@ -391,6 +392,8 @@ solutions.
 @tab liba52 is used internally for decoding.
 @item Vorbis                 @tab  X   @tab
 @tab encoding is supported thru the external library libvorbis.
+@item WMA V1/V2              @tab      @tab X
+
 @end multitable
 
 @code{X} means that the encoding (resp. decoding) is supported.