Mercurial > mplayer.hg

changeset 14024:0d9e27059495

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MPEG-X spelling
author diego
date Wed, 24 Nov 2004 11:23:21 +0000
parents b055a075999a
children 571f08316b2d
files DOCS/man/en/mplayer.1 DOCS/xml/en/codecs.xml DOCS/xml/en/documentation.xml DOCS/xml/en/faq.xml DOCS/xml/en/formats.xml DOCS/xml/en/history.xml DOCS/xml/en/install.xml DOCS/xml/en/mencoder.xml DOCS/xml/en/video.xml
diffstat 9 files changed, 77 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Nov 24 11:23:21 2004 +0000
@@ -183,7 +183,7 @@
 (MPlayer's Movie Encoder) is a simple movie encoder, designed to encode
 MPlayer-playable movies (see above) to other MPlayer-playable formats (see
 below).
-It encodes to MPEG4 (DivX/XviD), one of the libavcodec codecs and
+It encodes to MPEG-4 (DivX/XviD), one of the libavcodec codecs and
 PCM/\:MP3/\:VBRMP3 audio in 1, 2 or 3\ passes.
 Furthermore it has stream copying abilities, a powerful filter system (crop,
 expand, flip, postprocess, rotate, scale, noise, rgb/\:yuv conversion) and
@@ -2403,7 +2403,7 @@
 .TP
 .B xvmc (X11 with \-vc ffmpeg12mc only)
 Video output driver that uses the XvMC (X Video Motion Compensation)
-extension of XFree86 4.x to speed up MPEG1/\:2 and VCR2 decoding.
+extension of XFree86 4.x to speed up MPEG-1/2 and VCR2 decoding.
 .PD 0
 .RSs
 .IPs benchmark
@@ -3322,9 +3322,9 @@
 .br
 3: 1/8 resolution
 .REss
-.IPs "sb=<number> (MPEG2 only)"
+.IPs "sb=<number> (MPEG-2 only)"
 Skip the given number of macroblock rows at the bottom.
-.IPs "st=<number> (MPEG2 only)"
+.IPs "st=<number> (MPEG-2 only)"
 Skip the given number of macroblock rows at the top.
 .IPs vismv=<value>
 vismv:
@@ -3481,7 +3481,7 @@
 .IPs "\-vc -divxds,-divx,"
 Skip Win32 DivX codecs.
 .IPs "\-vc ffmpeg12,mpeg12,"
-Try libavcodec's MPEG1/\:2 codec, then libmpeg2, then others.
+Try libavcodec's MPEG-1/2 codec, then libmpeg2, then others.
 .RE
 .PD 1
 .
@@ -3949,7 +3949,7 @@
 .
 .TP
 .B lavc[=quality:fps]
-Fast software YV12 to MPEG1 conversion with libavcodec for use with DVB/\:DXR3.
+Fast software YV12 to MPEG-1 conversion with libavcodec for use with DVB/\:DXR3.
 Faster and of better quality than \-vf fame.
 .RSs
 .IPs quality
@@ -3964,7 +3964,7 @@
 .
 .TP
 .B fame\ \ \ 
-Fast software YV12 to MPEG1 conversion with libfame for use with DVB/\:DXR3.
+Fast software YV12 to MPEG-1 conversion with libfame for use with DVB/\:DXR3.
 .
 .TP
 .B dvbscale[=aspect]
@@ -4410,7 +4410,7 @@
 .
 .TP
 .B softpulldown
-This filter works only correct with MEncoder and acts on the MPEG2 flags
+This filter works only correct with MEncoder and acts on the MPEG-2 flags
 used for soft 3:2 pulldown (soft telecine).
 If you want to use the ivtc or detc filter on movies that are partly soft
 telecined, inserting this filter before them should make them more reliable.
@@ -5336,7 +5336,7 @@
 .IPs h263p
 H.263+
 .IPs mpeg4
-MPEG4 (DivX 4/5)
+MPEG-4 (DivX 4/5)
 .IPs msmpeg4
 DivX 3
 .IPs msmpeg4v2
@@ -5348,9 +5348,9 @@
 .IPs rv10\ 
 an old RealVideo codec
 .IPs mpeg1video
-MPEG1 video
+MPEG-1 video
 .IPs mpeg2video
-MPEG2 video
+MPEG-2 video
 .IPs huffyuv
 HuffYUV
 .IPs asv1\ 
@@ -5421,7 +5421,7 @@
 .IPs 0
 no B-frames (default)
 .IPs 0\-2
-sane range for MPEG4
+sane range for MPEG-4
 .RE
 .PD 1
 .
@@ -5506,7 +5506,7 @@
 0 is equivalent to 1, which makes every frame a keyframe.
 Values >300 are not recommended as the quality might be bad depending upon
 decoder, encoder and luck.
-For a strict MPEG1/\:2/\:4 compliance this would have to be <=132.
+For a strict MPEG-1/2/4 compliance this would have to be <=132.
 .
 .TP
 .B sc_threshold=<-1000000\-1000000>
@@ -5647,7 +5647,7 @@
 .TP
 .B vrc_buf_size=<value>
 buffer size in kbit (pass\ 1/\:2).
-For MPEG1/\:2 this also sets the vbv buffer size, use 327 for VCD,
+For MPEG-1/2 this also sets the vbv buffer size, use 327 for VCD,
 917 for SVCD and 1835 for DVD.
 .
 .TP
@@ -5850,7 +5850,7 @@
 disabled (default)
 .IPs 1
 Only recommended if you want to feed the output into the
-MPEG4 reference decoder.
+MPEG-4 reference decoder.
 .IPs -1
 Allows non-standard YV12 HuffYUV encoding (20% smaller files, but cannot be
 played by the official HuffYUV codec).
@@ -6592,7 +6592,7 @@
 .br
 .I WARNING:
 This will generate an illegal bitstream, and most likely not be decodable
-by any MPEG4 decoder besides libavcodec or XviD.
+by any MPEG-4 decoder besides libavcodec or XviD.
 .br
 .I WARNING:
 As of XviD-1.0.x, this option is no longer available.
@@ -6652,7 +6652,7 @@
 .br
 .I WARNING:
 This will generate an illegal bitstream, and will not be
-decodable by ISO-MPEG4 decoders except DivX/\:libavcodec/\:XviD.
+decodable by ISO-MPEG-4 decoders except DivX/\:libavcodec/\:XviD.
 .br
 .I WARNING:
 This will also store a fake DivX version in the file so the bug
@@ -6704,7 +6704,7 @@
 .
 .TP
 .B (no)qpel
-MPEG4 uses a half pixel precision for its motion search by default.
+MPEG-4 uses a half pixel precision for its motion search by default.
 The standard proposes a mode where encoders are allowed to use quarter
 pixel precision.
 This option usually results in a sharper image.
@@ -6893,7 +6893,7 @@
 PAR is the ratio of the width and height of a single pixel.
 So both are related like this: DAR = PAR * (width/height).
 .br
-MPEG4 defines 5 pixel aspect ratios and one extended
+MPEG-4 defines 5 pixel aspect ratios and one extended
 one, giving the opportunity to specify a specific pixel aspect
 ratio.
 5 standard modes can be specified:
--- a/DOCS/xml/en/codecs.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/codecs.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -19,12 +19,12 @@
 
 <itemizedlist>
 <listitem><simpara>
-  <emphasis role="bold">MPEG1</emphasis> (<emphasis role="bold">VCD</emphasis>) and
-  <emphasis role="bold">MPEG2</emphasis> (<emphasis role="bold">DVD</emphasis>) video
+  <emphasis role="bold">MPEG-1</emphasis> (<emphasis role="bold">VCD</emphasis>) and
+  <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),
-  DivX 5 (Pro), 3ivX, M$ MPEG4</emphasis> v1, v2 and other MPEG4 variants
+  DivX 5 (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>
@@ -85,7 +85,7 @@
 Their first available alpha version was OpenDivX 4.0 alpha 47 and 48.
 Support for this was included in <application>MPlayer</application> in the
 past, and built by default. We also used its postprocessing code to
-optionally enhance visual quality of MPEG1/2 movies. Now we use our own,
+optionally enhance visual quality of MPEG-1/2 movies. Now we use our own,
 for all file types.
 </para>
 
@@ -203,7 +203,7 @@
 </para>
 
 <para>
-It contains a lot of nice codecs, especially important are the MPEG4 variants:
+It contains a lot of nice codecs, especially important are the MPEG-4 variants:
 DivX3, DivX4, DivX5, Windows Media Video 7/8 (WMV1/WMV2). Also a very interesting one
 is the WMA decoder.
 </para>
@@ -353,11 +353,11 @@
 
 
 <sect3 id="mpeg12">
-<title>MPEG 1/2 video</title>
+<title>MPEG-1/2 video</title>
 <para>
-MPEG1 and MPEG2 are decoded by the multiplatform native <systemitem
+MPEG-1 and MPEG-2 are decoded by the multiplatform native <systemitem
 class="library">libmpeg2</systemitem> library, whose source code is
-included in <application>MPlayer</application>.  We handle buggy MPEG 1/2
+included in <application>MPlayer</application>.  We handle buggy MPEG-1/2
 video files by catching <systemitem>Signal 11</systemitem>
 (<systemitem>segmentation fault</systemitem>), and quickly
 reinitializing the codec, continuing exactly from where the failure
--- a/DOCS/xml/en/documentation.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/documentation.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -61,7 +61,7 @@
 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">MPEG4 (DivX)</emphasis> movies too. Another big
+<emphasis role="bold">MPEG-4 (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
@@ -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">MPEG4 (DivX4)</emphasis>
+can encode with various codecs, like <emphasis role="bold">MPEG-4 (DivX4)</emphasis>
 (1 or 2 passes), <systemitem class="library">libavcodec</systemitem>,
 <emphasis role="bold">PCM/MP3/VBR MP3</emphasis>
 audio.
--- a/DOCS/xml/en/faq.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/faq.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -1420,7 +1420,7 @@
 
 <qandaentry>
 <question><para>
-I can't encode an ASF file to AVI/MPEG4 (DivX) because it uses 1000 fps.
+I can't encode an ASF file to AVI/MPEG-4 (DivX) because it uses 1000 fps.
 </para></question>
 <answer><para>
 Because ASF uses variable frame rate but AVI uses a fixed one, you
--- a/DOCS/xml/en/formats.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/formats.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -7,24 +7,24 @@
 It is important to clarify a common mistake. When people see a file with a
 <filename>.AVI</filename> extension, they immediately conclude that it is
 not an MPEG file.  That is not true. At least not entirely. Contrary to
-popular belief such a file <emphasis>can</emphasis> contain MPEG1 video.
+popular belief such a file <emphasis>can</emphasis> contain MPEG-1 video.
 </para>
 
 <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,
-MPEG4 (DivX), Indeo5, 3ivx.
+Examples of video <emphasis role="bold">codecs</emphasis> are: MPEG-1, MPEG-2,
+MPEG-4 (DivX), Indeo5, 3ivx.
 Examples of file <emphasis role="bold">formats</emphasis> are: MPG, AVI, ASF.
 </para>
 
 <para>
 In theory, you can put an OpenDivX video and MP3 audio
 into an <emphasis role="bold">MPG format file</emphasis>. However, most
-players will not play it, since they expect MPEG1 video and MP2 audio (unlike
+players will not play it, since they expect MPEG-1 video and MP2 audio (unlike
 <emphasis role="bold">AVI</emphasis>, <emphasis role="bold">MPG</emphasis>
 does not have the necessary fields to describe its video and audio streams).
-Or you might put MPEG1 video into an AVI file.
+Or you might put MPEG-1 video into an AVI file.
 <ulink url="http://ffmpeg.org/">FFmpeg</ulink> and
 <link linkend="mencoder"><application>MEncoder</application></link> can create these files.
 </para>
@@ -43,7 +43,7 @@
 <itemizedlist>
 <listitem><simpara>
   MPG: This is the most <emphasis role="bold">basic</emphasis> form of the
-  MPEG file formats. It contains MPEG1 video, and MP2 (MPEG-1 layer 2) or
+  MPEG file formats. It contains MPEG-1 video, and MP2 (MPEG-1 layer 2) or
   rarely MP1 audio.
   </simpara></listitem>
 <listitem><simpara>
@@ -56,7 +56,7 @@
 <listitem><simpara>
   VOB: This is the MPEG file format on <emphasis role="bold">DVDs</emphasis>.
   It is the same as MPG, plus the capability to contain subtitles or non-MPEG
-  (AC3) audio. It contains encoded MPEG2 video and usually AC3 audio, but DTS,
+  (AC3) audio. It contains encoded MPEG-2 video and usually AC3 audio, but DTS,
   MP2 and uncompressed LPCM are allowed, too. <emphasis role="bold">Read the
   <link linkend="dvd">DVD</link> section</emphasis>!
   </simpara></listitem>
@@ -85,7 +85,7 @@
 
 <para>
 Designed by Microsoft, <emphasis role="bold">AVI (Audio Video Interleaved)</emphasis>
-is a widespread multipurpose format currently used mostly for MPEG4 (DivX and DivX4)
+is a widespread multipurpose format currently used mostly for MPEG-4 (DivX and DivX4)
 video. It has many known drawbacks and shortcomings (for example in streaming). It
 supports one video stream and 0 to 99 audio streams and can be as big as
 2GB, but there exists an extension allowing bigger files called
@@ -183,8 +183,8 @@
 <para>
 These formats were designed by Apple and can contain any codec, CBR or VBR.
 They usually have a <filename>.QT</filename> or <filename>.MOV</filename>
-extension. Note that since the MPEG4 group chose QuickTime as the recommended
-file format for MPEG4, their MOV files come with a <filename>.MPG</filename> or
+extension. Note that since the MPEG-4 group chose QuickTime as the recommended
+file format for MPEG-4, their MOV files come with a <filename>.MPG</filename> or
 <filename>.MP4</filename> extension (Interestingly the video and audio
 streams in these files are real MPG and AAC files. You can even extract them with the
 <option>-dumpvideo</option> and <option>-dumpaudio</option> options.).
@@ -261,7 +261,7 @@
 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 MPEG4 (DivX)/etc!) them all.
+them with <application>MEncoder</application> to MPEG-4 (DivX)/etc!) them all.
 Seeking works.
 </para>
 </sect3>
--- a/DOCS/xml/en/history.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/history.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -12,7 +12,7 @@
 <application>xanim</application>, <application>avifile</application>,
 <application>xmmp</application>) but they all have some problem. Mostly with
 special files or with audio/video sync. Most of them are unable to play both
-MPEG1, MPEG2 and AVI (DivX) files. Many players have image quality or speed
+MPEG-1, MPEG-2 and AVI (DivX) files. Many players have image quality or speed
 problems too. So I've decided to write/modify one...
 </para></blockquote><para>A'rpi, 2001</para>
 
--- a/DOCS/xml/en/install.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/install.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -151,7 +151,7 @@
     </simpara></listitem>
   <listitem><simpara>
     this codec is the <emphasis role="bold">fastest codec available</emphasis> for
-    DivX/3/4/5 and other MPEG4 types. Recommended!
+    DivX/3/4/5 and other MPEG-4 types. Recommended!
     </simpara></listitem>
   </itemizedlist>
   </para></listitem>
--- a/DOCS/xml/en/mencoder.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/mencoder.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -15,7 +15,7 @@
 </para>
 
 <sect1 id="menc-feat-mpeg4">
-<title>Encoding 2-pass MPEG4 (&quot;DivX&quot;)</title>
+<title>Encoding 2-pass MPEG-4 (&quot;DivX&quot;)</title>
 
 <para>
 The name comes from the fact that this method encodes the file <emphasis>twice</emphasis>.
@@ -31,7 +31,7 @@
 <example>
 <title>copy audio track</title>
 <para>
-2-pass encode of a DVD to an MPEG4 (&quot;DivX&quot;) AVI while copying
+2-pass encode of a DVD to an MPEG-4 (&quot;DivX&quot;) AVI while copying
 the audio track.
 <screen>
 mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o <replaceable>movie.avi</replaceable>
@@ -43,7 +43,7 @@
 <example>
 <title>encode audio track</title>
 <para>
-2-pass encode of a DVD to an MPEG4 (&quot;DivX&quot;) AVI while encoding
+2-pass encode of a DVD to an MPEG-4 (&quot;DivX&quot;) AVI while encoding
 the audio track to MP3.
 <screen>
 mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac mp3lame -lameopts vbr=3 -o <replaceable>movie.avi</replaceable>
@@ -60,14 +60,14 @@
 files. It's probably useful only with
 <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>'s
 <emphasis>mpeg1video</emphasis> codec, because players - except
-<application>MPlayer</application> - expect MPEG1 video, and MPEG1 layer 2 (MP2)
+<application>MPlayer</application> - expect MPEG-1 video, and MPEG-1 layer 2 (MP2)
 audio streams in MPEG files.
 </para>
 
 <para>
 This feature is not very useful right now, aside that it probably has many bugs,
 but the more importantly because <application>MEncoder</application> currently
-cannot encode MPEG1 layer 2 (MP2) audio, which all other players expect in MPEG files.
+cannot encode MPEG-1 layer 2 (MP2) audio, which all other players expect in MPEG files.
 </para>
 
 <para>
@@ -124,7 +124,7 @@
 <listitem><para>
   <emphasis role="bold">Video stream</emphasis> (option <option>-ovc copy</option>):
   nice stuff can be done :) Like, putting (not converting!) FLI or VIVO or
-  MPEG1 video into an AVI file! Of course only
+  MPEG-1 video into an AVI file! Of course only
   <application>MPlayer</application> can play such files :) And it probably
   has no real life value at all. Rationally: video stream copying can be
   useful for example when only the audio stream has to be encoded (like,
@@ -210,13 +210,13 @@
   H.263+
   </entry></row>
 <row><entry>mpeg4</entry><entry>
-  ISO standard MPEG4 (DivX 5, XVID compatible)
+  ISO standard MPEG-4 (DivX 5, XVID compatible)
   </entry></row>
 <row><entry>msmpeg4</entry><entry>
-  pre-standard MPEG4 variant by MS, v3 (AKA DivX3)
+  pre-standard MPEG-4 variant by MS, v3 (AKA DivX3)
   </entry></row>
 <row><entry>msmpeg4v2</entry><entry>
-  pre-standard MPEG4 by MS, v2 (used in old asf files)
+  pre-standard MPEG-4 by MS, v2 (used in old asf files)
   </entry></row>
 <row><entry>wmv1</entry><entry>
   Windows Media Video, version 1 (AKA WMV7)
@@ -228,10 +228,10 @@
   an old RealVideo codec
   </entry></row>
 <row><entry>mpeg1video</entry><entry>
-  MPEG1 video
+  MPEG-1 video
   </entry></row>
 <row><entry>mpeg2video</entry><entry>
-  MPEG2 video
+  MPEG-2 video
   </entry></row>
 <row><entry>huffyuv</entry><entry>
   lossless compression
@@ -291,7 +291,7 @@
 
 <informalexample>
 <para>
-Creating an MPEG4 file from all the JPEG files in the current directory:
+Creating an MPEG-4 file from all the JPEG files in the current directory:
 <screen>
 mencoder mf://*.jpg -mf type=jpg:w=800:h=600:fps=25 -ovc lavc -lavcopts vcodec=mpeg4 -oac copy -o <replaceable>output.avi</replaceable>
 </screen>
@@ -300,7 +300,7 @@
 
 <informalexample>
 <para>
-Creating an MPEG4 file from some JPEG files in the current directory:
+Creating an MPEG-4 file from some JPEG files in the current directory:
 <screen>
 mencoder mf://<replaceable>frame001.jpg,frame002.jpg</replaceable> -mf type=jpg:w=800:h=600:fps=25 -ovc lavc -lavcopts vcodec=mpeg4 -oac copy -o <replaceable>output.avi</replaceable>
 </screen>
@@ -415,7 +415,7 @@
 <sect1 id="aspect">
 <title>Preserving aspect ratio</title>
 <para>
-DVDs and SVCDs (i.e. MPEG1/2) files contain an aspect ratio value, which
+DVDs and SVCDs (i.e. MPEG-1/2) files contain an aspect ratio value, which
 describes how the player should scale the video stream, so humans won't
 have egg heads (ex.: 480x480 + 4:3 = 640x480). However when encoding to AVI
 (DivX) files, you have be aware that AVI headers don't store this value.
@@ -426,10 +426,10 @@
 <para>There is</para>
 
 <para>
-MPEG4 has an unique feature: the video stream can contain its needed aspect
-ratio. Yes, just like MPEG1/2 (DVD, SVCD) and H.263 files. Regretfully, there are
+MPEG-4 has an unique feature: the video stream can contain its needed aspect
+ratio. Yes, just like MPEG-1/2 (DVD, SVCD) and H.263 files. Regretfully, there are
 <emphasis role="bold">no</emphasis> video players outside which support this
-attribute of MPEG4, except <application>MPlayer</application>.
+attribute of MPEG-4, except <application>MPlayer</application>.
 </para>
 
 <para>
@@ -519,7 +519,7 @@
 </sect1>
 
 <sect1 id="menc-feat-dvd-mpeg4">
-<title>Making a high quality MPEG4 (&quot;DivX&quot;) rip of a DVD movie</title>
+<title>Making a high quality MPEG-4 (&quot;DivX&quot;) rip of a DVD movie</title>
 
 <para>
   One frequently asked question is "How do I make the highest quality DVD
@@ -529,14 +529,14 @@
 
 <para>
   This question is perhaps at least somewhat wrongly posed. After all, if
-  you don't care about file size, why not simply copy the MPEG2 video
+  you don't care about file size, why not simply copy the MPEG-2 video
   stream from the DVD whole? Sure, your AVI will end up being 5GB, give
   or take, but if you want the best quality and don't care about size,
   this is certainly your best option.
 </para>
 
 <para>
-  In fact, the reason you want to transcode a DVD into MPEG4 is
+  In fact, the reason you want to transcode a DVD into MPEG-4 is
   specifically because you <emphasis role="bold">do</emphasis> care about
   file size.
 </para>
@@ -666,7 +666,7 @@
 <para>
   <application>MPlayer</application> provides a crop detection filter that
   will determine the crop rectangle (<option>-vf cropdetect</option>).
-  Because MPEG4 uses 16x16 macroblocks, you'll want to make sure that each
+  Because MPEG-4 uses 16x16 macroblocks, you'll want to make sure that each
   dimension of the video you're encoding is a multiple of 16 or else you
   will be degrading quality, especially at lower bitrates. You can do this
   by rounding the width and height of the crop rectangle down to the nearest
--- a/DOCS/xml/en/video.xml	Wed Nov 24 00:54:20 2004 +0000
+++ b/DOCS/xml/en/video.xml	Wed Nov 24 11:23:21 2004 +0000
@@ -1734,7 +1734,7 @@
 <formalpara>
 <title>USAGE</title>
 <para>
-Hardware decoding (playing standard MPEG1/2 files) can be done with this command:
+Hardware decoding (playing standard MPEG-1/2 files) can be done with this command:
 </para>
 </formalpara>
 
@@ -1743,7 +1743,7 @@
 </para>
 
 <para>
-Software decoding or transcoding different formats to MPEG1 can be achieved using
+Software decoding or transcoding different formats to MPEG-1 can be achieved using
 a command like this:
 </para>
 <para><screen>
@@ -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)
-MPEG4 (DivX) try:
+MPEG-4 (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 MPEG4 (DivX), try:
+640x384 MPEG-4 (DivX), try:
 </para>
 
 <para>
@@ -1774,7 +1774,7 @@
 </para>
 
 <para>
-If your CPU is too slow for a full size 720x576 MPEG4 (DivX), try downscaling:
+If your CPU is too slow for a full size 720x576 MPEG-4 (DivX), try downscaling:
 </para>
 
 <para>
@@ -1805,7 +1805,7 @@
 </para>
 
 <para>
-To keep the aspect ratio of MPEG4 (DivX) files and get the optimal scaling
+To keep the aspect ratio of MPEG-4 (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>
@@ -1944,7 +1944,7 @@
 <para>
 In the future you may expect the ability to display OSD and subtitles using
 the native OSD feature of DVB cards, as well as more fluent playback of
-non-25fps movies and realtime transcoding between MPEG2 and MPEG4 (partial
+non-25fps movies and realtime transcoding between MPEG-2 and MPEG-4 (partial
 decompression).
 </para>
 </sect3>
@@ -2045,8 +2045,8 @@
 <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 MPEG4 (DivX) movies. People
-have reported problems using the prebuf option when playing MPEG1/2 files. You
+<option>:prebuf:sync</option> seems to work great when playing MPEG-4 (DivX) movies. People
+have reported problems using the prebuf option when playing MPEG-1/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.
 </para></listitem>
@@ -2073,8 +2073,8 @@
 <varlistentry>
 <term><option>-vf lavc/fame</option></term>
 <listitem><para>
-To watch non-MPEG content on the em8300 (i.e. MPEG4 (DivX) or RealVideo)
-you have to specify an MPEG1 video filter such as
+To watch non-MPEG content on the em8300 (i.e. MPEG-4 (DivX) or RealVideo)
+you have to specify an MPEG-1 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
@@ -2093,10 +2093,10 @@
 <varlistentry>
 <term><option>-vf expand=-1:-1:-1:-1:1</option></term>
 <listitem><para>
-Although the DXR3 driver can put some OSD onto the MPEG1/2/4 video, it has
+Although the DXR3 driver can put some OSD onto the MPEG-1/2/4 video, it has
 much lower quality than <application>MPlayer</application>'s traditional OSD,
 and has several refresh problems as well. The command line above will firstly
-convert the input video to MPEG4 (this is mandatory, sorry), then apply an
+convert the input video to MPEG-4 (this is mandatory, sorry), then apply an
 expand filter which won't expand anything (-1: default), but apply the normal
 OSD onto the picture (that's what the "1" at the end does).
 </para></listitem>