# HG changeset patch
# User diego
# Date 1100683685 0
# Node ID 2946cbf097b57106a3cbbe52a4148f71ff3fdb96
# Parent  3027af083f6f7af9993dd063b230f97065d2815f
DivX is MPEG4, so let's call it MPEG4 to avoid confusion.

diff -r 3027af083f6f -r 2946cbf097b5 DOCS/xml/en/documentation.xml
--- a/DOCS/xml/en/documentation.xml	Wed Nov 17 08:25:08 2004 +0000
+++ b/DOCS/xml/en/documentation.xml	Wed Nov 17 09:28:05 2004 +0000
@@ -61,8 +61,8 @@
 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 @@
 <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.
diff -r 3027af083f6f -r 2946cbf097b5 DOCS/xml/en/faq.xml
--- a/DOCS/xml/en/faq.xml	Wed Nov 17 08:25:08 2004 +0000
+++ b/DOCS/xml/en/faq.xml	Wed Nov 17 09:28:05 2004 +0000
@@ -1420,7 +1420,7 @@
 
 <qandaentry>
 <question><para>
-I can't encode ASF files to AVI/DivX because it uses 1000 fps?
+I can't encode ASF files to AVI/MPEG4 (DivX) because it uses 1000 fps?
 </para></question>
 <answer><para>
 Because ASF uses variable frame rate but AVI uses a fixed one, you
diff -r 3027af083f6f -r 2946cbf097b5 DOCS/xml/en/formats.xml
--- a/DOCS/xml/en/formats.xml	Wed Nov 17 08:25:08 2004 +0000
+++ b/DOCS/xml/en/formats.xml	Wed Nov 17 09:28:05 2004 +0000
@@ -13,7 +13,8 @@
 <para>
 You see, a <emphasis role="bold">codec</emphasis> is not the same as a
 <emphasis role="bold">file format</emphasis>.
-Examples of video <emphasis role="bold">codecs</emphasis> are: MPEG1, MPEG2, DivX, Indeo5, 3ivx.
+Examples of video <emphasis role="bold">codecs</emphasis> are: MPEG1, MPEG2,
+MPEG4 (DivX), Indeo5, 3ivx.
 Examples of file <emphasis role="bold">formats</emphasis> are: MPG, AVI, ASF.
 </para>
 
@@ -260,7 +261,8 @@
 contain uncompressed YV12, YV12+RTJpeg compressed, YV12 RTJpeg+lzo
 compressed, and YV12+lzo compressed frames.
 <application>MPlayer</application> decodes (and also <emphasis role="bold">encodes</emphasis>
-them with <application>MEncoder</application> to DivX/etc!) them all. Seeking works.
+them with <application>MEncoder</application> to MPEG4 (DivX)/etc!) them all.
+Seeking works.
 </para>
 </sect3>
 
diff -r 3027af083f6f -r 2946cbf097b5 DOCS/xml/en/video.xml
--- a/DOCS/xml/en/video.xml	Wed Nov 17 08:25:08 2004 +0000
+++ b/DOCS/xml/en/video.xml	Wed Nov 17 09:28:05 2004 +0000
@@ -1758,14 +1758,14 @@
 <option>-vf</option> option. DVB cards accept various widths, like 720, 704,
 640, 512, 480, 352 etc and do hardware scaling in horizontal direction, so you
 do not need to scale horizontally in most cases. For a 512x384 (aspect 4:3)
-DivX try:
+MPEG4 (DivX) try:
 </para>
 
 <para><screen>mplayer -ao mpegpes -vo mpegpes -vf scale=512:576</screen></para>
 
 <para>If you have a widescreen movie and you do not want to scale it to full height,
 you can use the <option>expand=w:h</option> filter to add black bands. To view a
-640x384 DivX, try:
+640x384 MPEG4 (DivX), try:
 </para>
 
 <para>
@@ -1773,7 +1773,9 @@
 </screen>
 </para>
 
-<para>If your CPU is too slow for a full size 720x576 DivX, try downscaling:</para>
+<para>
+If your CPU is too slow for a full size 720x576 MPEG4 (DivX), try downscaling:
+</para>
 
 <para>
 <screen>mplayer -ao mpegpes -vo mpegpes -vf scale=352:576 <replaceable>file.avi</replaceable>
@@ -1803,7 +1805,7 @@
 </para>
 
 <para>
-To keep the aspect ratio of DivX files and get the optimal scaling
+To keep the aspect ratio of MPEG4 (DivX) files and get the optimal scaling
 parameters (hardware horizontal scaling and software vertical scaling
 while keeping the right aspect ratio), use the new dvbscale filter:
 </para>
@@ -2043,7 +2045,7 @@
 <option><replaceable>device</replaceable></option> = device number to use if you have more than one em8300
 card.
 Any of these options may be left out.
-<option>:prebuf:sync</option> seems to work great when playing DivX movies. People
+<option>:prebuf:sync</option> seems to work great when playing MPEG4 (DivX) movies. People
 have reported problems using the prebuf option when playing MPEG1/2 files. You
 might want to try running without any options first, if you have sync problems,
 or DVD subtitle problems, give <option>:sync</option> a try.
@@ -2071,8 +2073,8 @@
 <varlistentry>
 <term><option>-vf lavc/fame</option></term>
 <listitem><para>
-To watch non-MPEG content on the em8300 (i.e. DivX or RealVideo) you have to
-specify an MPEG1 video filter such as
+To watch non-MPEG content on the em8300 (i.e. MPEG4 (DivX) or RealVideo)
+you have to specify an MPEG1 video filter such as
 <systemitem class="library">libavcodec</systemitem> (lavc) or
 <systemitem class="library">libfame</systemitem> (fame). At
 the moment lavc is both faster and gives better image quality, it is suggested