diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-10-03 21:09:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-10-03 21:09:02 +0000 |
| commit | 2bc5da7bf9c293564a75ff3ef082146e7b947489 (patch) | |
| tree | a03f1bac62ab1f115a515a39b2184363156015fc /doc/ffmpeg-doc.texi | |
| parent | 0533322ea3e91c3f7efc642456a024a305ecb967 (diff) | |
| download | ffmpeg-2bc5da7bf9c293564a75ff3ef082146e7b947489.tar.gz | |
remove confusing divx note
Originally committed as revision 6546 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffmpeg-doc.texi')
| -rw-r--r-- | doc/ffmpeg-doc.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index cc51105b9b..c41807db1a 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -764,10 +764,10 @@ following image formats are supported: @item Supported Codec @tab Encoding @tab Decoding @tab Comments @item MPEG-1 video @tab X @tab X @item MPEG-2 video @tab X @tab X -@item MPEG-4 @tab X @tab X @tab also known as DivX4/5 +@item MPEG-4 @tab X @tab X @item MSMPEG4 V1 @tab X @tab X @item MSMPEG4 V2 @tab X @tab X -@item MSMPEG4 V3 @tab X @tab X @tab also known as DivX3 +@item MSMPEG4 V3 @tab X @tab X @item WMV7 @tab X @tab X @item WMV8 @tab X @tab X @tab not completely working @item H.261 @tab X @tab X |