1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 21:31:13 +00:00

fix XviD spelling

replace some old DivX5's


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20352 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
kraymer 2006-10-22 12:17:07 +00:00
parent 56e6f4ad0f
commit f6649b1359
4 changed files with 11 additions and 11 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- synced with r20341 -->
<!-- synced with r20352 -->
<chapter id="codecs">
<title>Codecs</title>
@ -7,7 +7,7 @@
<title>Videocodecs</title>
<para>
Die <ulink url="../../codecs-status.html">Codec Status Tabelle</ulink> ist eine vollständige
Die <ulink url="../../codecs-status.html">Codecstatustabelle</ulink> ist eine vollständige
Liste aller unterstützten Codecs, die täglich neu erstellt wird.
Einige Binärcodecs zum Gebrauch mit MPlayer sind im
<ulink url="http://www.mplayerhq.hu/design7/dload.html#binary_codecs">Downloadbereich</ulink>
@ -25,7 +25,7 @@
</simpara></listitem>
<listitem><simpara>
Native Decoder für
<emphasis role="bold">DivX ;-), OpenDivX (DivX4), DivX 5 (Pro), 3ivX, M$ MPEG-4</emphasis>
<emphasis role="bold">DivX ;-), OpenDivX (DivX4), DivX666666vX, M$ MPEG-4</emphasis>
v1, v2 und andere MPEG-4 Varianten
</simpara></listitem>
<listitem><simpara>
@ -90,7 +90,7 @@
<para>
Es enthält eine Reihe netter Codecs, besonders wichtig sind hierbei die MPEG-4 Varianten:
DivX3, DivX4, DivX5, Windows Media Video 7/8 (WMV1/WMV2). Weiterhin sehr interessant ist der WMA-Decoder.
DivX3, DivX4, DivX6, Windows Media Video 7/8 (WMV1/WMV2). Weiterhin sehr interessant ist der WMA-Decoder.
</para>
<para>
@ -132,7 +132,7 @@
</para>
<para>
Beachte, dass Xvid nicht benötigt wird, um mit Xvid encodiertes Video zu decodieren.
Beachte, dass XviD nicht benötigt wird, um mit XviD encodiertes Video zu decodieren.
In der Standardkonfiguration wird dafür <systemitem class="library">libavcodec</systemitem>
benutzt, da er höhere Geschwindigkeit bietet.
</para>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- In sync with r20280 -->
<!-- In sync with r20352 -->
<chapter id="encoding-guide">
<title>Encodieren mit <application>MEncoder</application></title>
@ -2571,7 +2571,7 @@ vcodec=mpeg2video:vbitrate=6000:ilme:ildct:acodec=mp2:abitrate=224</screen>
H.263+
</entry></row>
<row><entry>mpeg4</entry><entry>
ISO Standard MPEG-4 (DivX 5, XviD-kompatibel)
ISO Standard MPEG-4 (DivX6, XviD-kompatibel)
</entry></row>
<row><entry>msmpeg4</entry><entry>
Pre-Standard MPEG-4 Variante von MS, v3 (AKA DivX3)

View File

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

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