diff options
| author | kraymer <kraymer@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-22 12:17:07 +0000 |
|---|---|---|
| committer | kraymer <kraymer@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-22 12:17:07 +0000 |
| commit | f6649b135950bc9ee4602d8a033aaaf3578510bf (patch) | |
| tree | d734cccae3254b4d078341fd786bf8c46ea77f02 /DOCS/xml/en | |
| parent | 56e6f4ad0f99278fd8b9c42ea9b7779104148e0a (diff) | |
| download | mpv-f6649b135950bc9ee4602d8a033aaaf3578510bf.tar.bz2 mpv-f6649b135950bc9ee4602d8a033aaaf3578510bf.tar.xz | |
fix XviD spelling
replace some old DivX5's
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20352 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 e3313440d1..5292f16eff 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -25,7 +25,7 @@ The most important ones above all: </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 @@ 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 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> diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml index 83fcf92fcc..766fb3d94e 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 (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) |