diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-11-19 20:09:45 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-11-19 20:09:45 +0000 |
| commit | 4745b5bf6cad82df283c032262316285a51660aa (patch) | |
| tree | 3290e9e154292bb659bbab5786a70ea613e18080 /doc/ffmpeg-doc.texi | |
| parent | fce16586a1273ff36df32688d09b2b4f2fd47f1c (diff) | |
| download | ffmpeg-4745b5bf6cad82df283c032262316285a51660aa.tar.gz | |
update
Originally committed as revision 1236 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
| -rw-r--r-- | doc/ffmpeg-doc.texi | 5 |
1 files changed, 4 insertions, 1 deletions
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. |