From 4745b5bf6cad82df283c032262316285a51660aa Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Tue, 19 Nov 2002 20:09:45 +0000 Subject: update Originally committed as revision 1236 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/ffmpeg-doc.html | 6 ++++++ doc/ffmpeg-doc.texi | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'doc') 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. DV X + +Huff YUV X X +

@@ -680,6 +683,9 @@ solutions. Vorbis X encoding is supported thru the external library libvorbis. + +WMA V1/V2 X +

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. -- cgit v1.2.3