diff options
| author |  kraymer <kraymer@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-22 13:34:48 +0000 |
|---|---|---|
| committer | kraymer <kraymer@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-22 13:34:48 +0000 |
| commit | 906b05f49388ab08c5645bfcfd05fc84fadbae05 (patch) | |
| tree | 6d739800beb7b73d442668ae03aaae87b1e29714 /DOCS/xml/en | |
| parent | 9815aef4d0cc106302af8f90da142823aa2f4f1a (diff) | |
remove some DivX version numbers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20361 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS/xml/en')
| -rw-r--r-- | DOCS/xml/en/codecs.xml | 6 | ||||
| -rw-r--r-- | DOCS/xml/en/encoding-guide.xml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 5292f16eff..0b35457e60 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -24,8 +24,8 @@ The most important ones above all: <emphasis role="bold">MPEG-2</emphasis> (<emphasis role="bold">DVD</emphasis>) video </simpara></listitem> <listitem><simpara> - native decoders for <emphasis role="bold">DivX ;-), OpenDivX (DivX4), - DivX6 (Pro), 3ivX, M$ MPEG-4</emphasis> v1, v2 and other MPEG-4 variants + native decoders for <emphasis role="bold">all DivX variants, + 3ivX, M$ MPEG-4</emphasis> v1, v2 and other MPEG-4 variants </simpara></listitem> <listitem><simpara> native decoder for <emphasis role="bold">Windows Media Video 7/8</emphasis> @@ -120,7 +120,7 @@ optimizations for most modern processors. <para> It began as a forked development of the OpenDivX codec. This happened when ProjectMayo changed OpenDivX to closed source -DivX4 (now DivX6), and the non-ProjectMayo people working on OpenDivX got angry, +DivX4, and the non-ProjectMayo people working on OpenDivX got angry, then started XviD. So both projects have the same origin. </para> diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index 766fb3d94e..1e208ae547 100644 --- a/DOCS/xml/en/encoding-guide.xml +++ b/DOCS/xml/en/encoding-guide.xml @@ -2382,7 +2382,7 @@ You can encode to the following codecs (more or less up to date): H.263+ </entry></row> <row><entry>mpeg4</entry><entry> - ISO standard MPEG-4 (DivX6, XviD compatible) + ISO standard MPEG-4 (DivX, XviD compatible) </entry></row> <row><entry>msmpeg4</entry><entry> pre-standard MPEG-4 variant by MS, v3 (AKA DivX3) |