summaryrefslogtreecommitdiffstats
path: root/DOCS/xml/en/documentation.xml
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-17 09:28:05 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-17 09:28:05 +0000
commit1fce02557e9a785f016ebdefe903872ead73715b (patch)
treecef12b1c33c8bc2dac912a5343f1edd5b4ff516d /DOCS/xml/en/documentation.xml
parent320fa92447adb3ea199fc2a5661ac0efd022de17 (diff)
downloadmpv-1fce02557e9a785f016ebdefe903872ead73715b.tar.bz2
mpv-1fce02557e9a785f016ebdefe903872ead73715b.tar.xz
DivX is MPEG4, so let's call it MPEG4 to avoid confusion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13962 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS/xml/en/documentation.xml')
-rw-r--r--DOCS/xml/en/documentation.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index fb3e89f77f..443e22ee59 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -61,8 +61,8 @@ many other Unices, and <emphasis role="bold">non-x86</emphasis> CPUs, see
QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA, Matroska files, supported by
many native, XAnim, RealPlayer, and Win32 DLL codecs. You can watch
<emphasis role="bold">VideoCD, SVCD, DVD, 3ivx, RealMedia, Sorenson, Theora</emphasis>, and
-<emphasis role="bold">DivX</emphasis> movies too. Another big feature of
-<application>MPlayer</application> is the wide range of
+<emphasis role="bold">MPEG4 (DivX)</emphasis> movies too. Another big
+feature of <application>MPlayer</application> is the wide range of
supported output drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib,
fbdev, AAlib, libcaca, DirectFB, but you can use GGI and SDL (and this way all
their drivers) and some lowlevel card-specific drivers (for Matrox, 3Dfx and
@@ -93,7 +93,7 @@ Encoder) is a simple movie encoder, designed to encode
<application>MPlayer</application>-playable movies
(<emphasis role="bold">AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</emphasis>)
to other <application>MPlayer</application>-playable formats (see below). It
-can encode with various codecs, like <emphasis role="bold">DivX4</emphasis>
+can encode with various codecs, like <emphasis role="bold">MPEG4 (DivX4)</emphasis>
(1 or 2 passes), <systemitem class="library">libavcodec</systemitem>,
<emphasis role="bold">PCM/MP3/VBR MP3</emphasis>
audio.