[MPlayer-DOCS] r20352 - in trunk/DOCS/xml: de/codecs.xml de/encoding-guide.xml en/codecs.xml en/encoding-guide.xml

[kraymer]

Author: kraymer
Date: Sun Oct 22 14:17:07 2006
New Revision: 20352

Modified:
   trunk/DOCS/xml/en/codecs.xml
   trunk/DOCS/xml/en/encoding-guide.xml

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/xml/de/codecs.xml
   trunk/DOCS/xml/de/encoding-guide.xml

Log:
fix XviD spelling
replace some old DivX5's


Modified: trunk/DOCS/xml/en/codecs.xml
==============================================================================
--- trunk/DOCS/xml/en/codecs.xml	(original)
+++ trunk/DOCS/xml/en/codecs.xml	Sun Oct 22 14:17:07 2006
@@ -25,7 +25,7 @@
   </simpara></listitem>
 <listitem><simpara>
   native decoders for <emphasis role="bold">DivX ;-), OpenDivX (DivX4),
-  DivX 5 (Pro), 3ivX, M$ MPEG-4</emphasis> v1, v2 and other MPEG-4 variants
+  DivX6 (Pro), 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,12 +120,12 @@
 <para>
 It began as a forked development of the OpenDivX codec.
 This happened when ProjectMayo changed OpenDivX to closed source
-DivX4 (now DivX5), and the non-ProjectMayo people working on OpenDivX got angry,
+DivX4 (now DivX6), and the non-ProjectMayo people working on OpenDivX got angry,
 then started XviD. So both projects have the same origin.
 </para>
 
 <para>
-Note that Xvid is not necessary to decode Xvid-encoded video.
+Note that XviD is not necessary to decode XviD-encoded video.
 <systemitem class="library">libavcodec</systemitem> is used by
 default as it offers better speed.
 </para>

Modified: trunk/DOCS/xml/en/encoding-guide.xml
==============================================================================
--- trunk/DOCS/xml/en/encoding-guide.xml	(original)
+++ trunk/DOCS/xml/en/encoding-guide.xml	Sun Oct 22 14:17:07 2006
@@ -2382,7 +2382,7 @@
   H.263+
   </entry></row>
 <row><entry>mpeg4</entry><entry>
-  ISO standard MPEG-4 (DivX 5, XviD compatible)
+  ISO standard MPEG-4 (DivX6, XviD compatible)
   </entry></row>
 <row><entry>msmpeg4</entry><entry>
   pre-standard MPEG-4 variant by MS, v3 (AKA DivX3)