RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

remove some DivX version numbers 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20361 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
kraymer 2006-10-22 13:34:48 +00:00
parent 9815aef4d0
commit 906b05f493
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOCS/xml/en/codecs.xml
View File

@ -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>

2
DOCS/xml/en/encoding-guide.xml
View File

@ -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)