rename: XviD -> Xvid

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20876 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 57 insertions, 57 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 4dd609115b..70f0cc4264 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -174,7 +174,7 @@ DVD subtitles (SPU streams, VOBsub and Closed Captions).
 (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 MPEG-4 (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
@@ -3951,7 +3951,7 @@ Manually work around encoder bugs.
 .br
 2 (msmpeg4v3): some old lavc generated msmpeg4v3 files (no autodetection)
 .br
-4 (mpeg4): XviD interlacing bug (autodetected if fourcc==XVIX)
+4 (mpeg4): Xvid interlacing bug (autodetected if fourcc==XVIX)
 .br
 8 (mpeg4): UMP4 (autodetected if fourcc==UMP4)
 .br
@@ -3959,7 +3959,7 @@ Manually work around encoder bugs.
 .br
 32 (mpeg4): illegal vlc bug (autodetected per fourcc)
 .br
-64 (mpeg4): XviD and DivX qpel bug (autodetected per fourcc/\:version)
+64 (mpeg4): Xvid and DivX qpel bug (autodetected per fourcc/\:version)
 .br
 128 (mpeg4): old standard qpel (autodetected per fourcc/\:version)
 .br
@@ -4272,13 +4272,13 @@ Disables aspect calculations.
 .
 .TP
 .B \-xvidopts <option1:option2:...>
-Specify additional parameters when decoding with XviD.
+Specify additional parameters when decoding with Xvid.
 .br
 .I NOTE:
-Since libavcodec is faster than XviD you might want to use the libavcodec
+Since libavcodec is faster than Xvid you might want to use the libavcodec
 postprocessing filter (\-vf pp) and decoder (\-vfm ffmpeg) instead.
 .sp 1
-XviD's internal postprocessing filters:
+Xvid's internal postprocessing filters:
 .PD 0
 .RSs
 .IPs deblock-chroma (also see \-vf pp)
@@ -7499,8 +7499,8 @@ if vrc_strategy is not set to 0.
 .IPs 0
 Use internal lavc ratecontrol (default).
 .IPs 1
-Use XviD ratecontrol (experimental; requires MEncoder to be compiled
-with support for XviD 1.1 or higher).
+Use Xvid ratecontrol (experimental; requires MEncoder to be compiled
+with support for Xvid 1.1 or higher).
 .RE
 .PD 1
 .
@@ -8440,7 +8440,7 @@ frame type and PSNR a little bit more.
 .B bitrate=<value> (CBR or two pass mode)
 Sets the bitrate to be used in kbits/\:second if <16000 or in bits/\:second
 if >16000.
-If <value> is negative, XviD will use its absolute value as the target size
+If <value> is negative, Xvid will use its absolute value as the target size
 (in kBytes) of the video and compute the associated bitrate automagically
 (default: 687 kbits/s).
 .
@@ -8502,7 +8502,7 @@ Use 4 motion vectors per macroblock.
 This might give better compression, but slows down encoding.
 .br
 .I WARNING:
-As of XviD-1.0.x, this option is no longer available separately, and its
+As of Xvid-1.0.x, this option is no longer available separately, and its
 functionality is included in the me_quality option.
 When me_quality > 4, 4mv is activated.
 .
@@ -8516,9 +8516,9 @@ to obtain a constant bitrate over an averaging range of frames.
 .B rc_averaging_period=<value>
 Real CBR is hard to achieve.
 Depending on the video material, bitrate can be variable, and hard to predict.
-Therefore XviD uses an averaging period for which it guarantees a given
+Therefore Xvid uses an averaging period for which it guarantees a given
 amount of bits (minus a small variation).
-This settings expresses the "number of frames" for which XviD averages
+This settings expresses the "number of frames" for which Xvid averages
 bitrate and tries to achieve CBR.
 .
 .TP
@@ -8532,7 +8532,7 @@ CBR mode: min & max quantizer for all frames (default: 2\-31)
 two pass mode: min & max quantizer for I/P-frames (default: 2\-31/\:2\-31)
 .br
 .I WARNING:
-As of XviD-1.0.x, this option is replaced by the
+As of Xvid-1.0.x, this option is replaced by the
 [min|max]_[i|p|b]quant options.
 .
 .TP
@@ -8551,7 +8551,7 @@ For low bitrates, the smoothing of H.263 will give you less block noise.
 When using custom matrices, MPEG must be used.
 .br
 .I WARNING:
-As of XviD-1.0.x, this option is replaced by the quant_type option.
+As of Xvid-1.0.x, this option is replaced by the quant_type option.
 .
 .TP
 .B mod_quant
@@ -8560,10 +8560,10 @@ Decide whether to use MPEG or H.263 quantizers on a frame-by-frame basis
 .br
 .I WARNING:
 This will generate an illegal bitstream, and most likely not be decodable
-by any MPEG-4 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.
+As of Xvid-1.0.x, this option is no longer available.
 .
 .TP
 .B keyframe_boost=<0\-1000> (two pass mode only)
@@ -8596,11 +8596,11 @@ Generate DivX5 compatible B-frames (default: on).
 This seems to be mandatory only for old versions of DivX's decoder.
 .br
 .I WARNING:
-As of XviD-1.0.x, this option is replaced by the closed_gop option.
+As of Xvid-1.0.x, this option is replaced by the closed_gop option.
 .
 .TP
 .B (no)grayscale
-Make XviD discard chroma planes so the encoded video is grayscale only.
+Make Xvid discard chroma planes so the encoded video is grayscale only.
 Note that this does not speed up encoding, it just prevents chroma data
 from being written in the last stage of encoding.
 .
@@ -8613,7 +8613,7 @@ file.)
 .PP
 .sp 1
 The following options are only available with the latest stable
-releases of XviD 1.0.x (api4).
+releases of Xvid 1.0.x (api4).
 .
 .TP
 .B (no)packed
@@ -8626,7 +8626,7 @@ you are doing.
 .br
 .I WARNING:
 This will generate an illegal bitstream, and will not be
-decodable by ISO-MPEG-4 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
@@ -8655,7 +8655,7 @@ aggressive production of B-frames may cause worse visual quality.
 .
 .TP
 .B (no)closed_gop
-This option tells XviD to close every GOP (Group Of Pictures bounded
+This option tells Xvid to close every GOP (Group Of Pictures bounded
 by two I-frames), which makes GOPs independent from each other.
 This just implies that the last frame of the GOP is either a P-frame or a
 N-frame but not a B-frame.
@@ -8688,7 +8688,7 @@ is worth activating.
 .
 .TP
 .B (no)gmc
-Enable Global Motion Compensation, which makes XviD generate special
+Enable Global Motion Compensation, which makes Xvid generate special
 frames (GMC-frames) which are well suited for Pan/\:Zoom/\:Rotating images.
 Whether or not the use of this option will save bits is highly
 dependent on the source material.
@@ -8705,7 +8705,7 @@ quality at fixed bitrate) at a lesser cost than with VHQ (default: on).
 .TP
 .B (no)cartoon
 Activate this if your encoded sequence is an anime/\:cartoon.
-It modifies some XviD internal thresholds so XviD takes better decisions on
+It modifies some Xvid internal thresholds so Xvid takes better decisions on
 frame types and motion vectors for flat looking cartoons.
 .
 .TP
@@ -8747,7 +8747,7 @@ neighbor blocks (default: on).
 The motion search algorithm is based on a search in the usual color domain
 and tries to find a motion vector that minimizes the difference between the
 reference frame and the encoded frame.
-With this setting activated, XviD will also use the frequency domain (DCT)
+With this setting activated, Xvid will also use the frequency domain (DCT)
 to search for a motion vector that minimizes not only the spatial
 difference but also the encoding length of the block.
 Fastest to slowest:
@@ -8813,7 +8813,7 @@ You can build such a file with xvid4conf's matrix editor.
 .
 .TP
 .B curve_compression_high=<0\-100>
-This setting allows XviD to take a certain percentage of bits away from
+This setting allows Xvid to take a certain percentage of bits away from
 high bitrate scenes and give them back to the bit reservoir.
 You could also use this if you have a clip with so many bits allocated
 to high-bitrate scenes that the low(er)-bitrate scenes start to look bad
@@ -8821,7 +8821,7 @@ to high-bitrate scenes that the low(er)-bitrate scenes start to look bad
 .
 .TP
 .B curve_compression_low=<0\-100>
-This setting allows XviD to give a certain percentage of extra bits to the
+This setting allows Xvid to give a certain percentage of extra bits to the
 low bitrate scenes, taking a few bits from the entire clip.
 This might come in handy if you have a few low-bitrate scenes that are
 still blocky (default: 0).
@@ -8868,9 +8868,9 @@ Most of the time users express their target bitrate for video w/o taking
 care of the video container overhead.
 This small but (mostly) constant overhead can cause the target file size
 to be exceeded.
-XviD allows users to set the amount of overhead per frame the
+Xvid allows users to set the amount of overhead per frame the
 container generates (give only an average per frame).
-0 has a special meaning, it lets XviD use its own default values
+0 has a special meaning, it lets Xvid use its own default values
 (default: 24 \- AVI average overhead).
 .
 .TP
@@ -8920,7 +8920,7 @@ DXN HDTV profile
 .RS
 .I NOTE:
 These profiles should be used in conjunction with an appropriate \-ffourcc.
-Generally DX50 is applicable, as some players do not recognize XviD but
+Generally DX50 is applicable, as some players do not recognize Xvid but
 most recognize DivX.
 .RE
 .
@@ -8990,7 +8990,7 @@ Returned values are in dB (decibel), the higher the better.
 .
 .PP
 .sp 1
-The following option is only available in XviD 1.1.x.
+The following option is only available in Xvid 1.1.x.
 .
 .TP
 .B bvhq=<0|1>
@@ -9002,7 +9002,7 @@ performance penalty (default: 1).
 .
 .PP
 .sp 1
-The following option is only available in the CVS version of XviD.
+The following option is only available in the CVS version of Xvid.
 .
 .TP
 .B threads=<0\-n>
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 6ba27c6b8e..03afaa6f93 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -109,10 +109,10 @@ Just run <filename>./configure</filename> and compile.
 
 
 <sect2 id="xvid">
-<title>XviD</title>
+<title>Xvid</title>
 
 <para>
-<ulink url="http://www.xvid.org">XviD</ulink> is a free software MPEG-4 ASP
+<ulink url="http://www.xvid.org">Xvid</ulink> is a free software MPEG-4 ASP
 compliant video codec, which features two pass encoding and full MPEG-4 ASP
 support, making it a lot more efficient than the well-known DivX codec.
 It yields very good video quality and good performance due to CPU
@@ -122,24 +122,24 @@ optimizations for most modern processors.
 It began as a forked development of the OpenDivX codec.
 This happened when ProjectMayo changed OpenDivX to closed source
 DivX4, and the non-ProjectMayo people working on OpenDivX got angry,
-then started XviD. So both projects have the same origin.
+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>
 
 <procedure>
-<title>Installing <systemitem class="library">XviD</systemitem></title>
+<title>Installing <systemitem class="library">Xvid</systemitem></title>
 <para>
   Like most open source software, it is available in two flavors:
   <ulink url="http://www.xvid.org/downloads.html">official releases</ulink>
   and the CVS version.
   The CVS version is usually stable enough to use, as most of the time it
   features fixes for bugs that exist in releases.
-  Here is what to do to make <systemitem class="library">XviD</systemitem>
+  Here is what to do to make <systemitem class="library">Xvid</systemitem>
   CVS work with <application>MEncoder</application> (you need at least
   <application>autoconf</application> 2.50,
   <application>automake</application> and <application>libtool</application>):
diff --git a/DOCS/xml/en/encoding-guide.xml b/DOCS/xml/en/encoding-guide.xml
index 6c0ea36c03..8dde7664b3 100644
--- a/DOCS/xml/en/encoding-guide.xml
+++ b/DOCS/xml/en/encoding-guide.xml
@@ -309,7 +309,7 @@
 <para>
   Most codecs which support ABR encode only support two pass encode
   while some others such as <systemitem class="library">x264</systemitem>,
-  <systemitem class="library">XviD</systemitem>
+  <systemitem class="library">Xvid</systemitem>
   and <systemitem class="library">libavcodec</systemitem> support
   multipass, which slightly improves quality at each pass,
   yet this improvement is no longer measurable nor noticeable after the
@@ -1089,7 +1089,7 @@
   In order to raise the CQ, typically you would downscale the movie given that the
   bitrate is computed in function of the target size and the length of the
   movie, which are constant.
-  With MPEG-4 ASP codecs such as <systemitem class="library">XviD</systemitem>
+  With MPEG-4 ASP codecs such as <systemitem class="library">Xvid</systemitem>
   and <systemitem class="library">libavcodec</systemitem>, a CQ below 0.18
   usually results in a pretty blocky picture, because there
   are not enough bits to code the information of each macroblock. (MPEG4, like
@@ -1101,7 +1101,7 @@
   More advanced encoding options such as those listed here for
   <link linkend="menc-feat-mpeg4-lavc-example-settings"><systemitem class="library">libavcodec</systemitem></link>
   and
-<link linkend="menc-feat-xvid-example-settings"><systemitem class="library">XviD</systemitem></link>
+<link linkend="menc-feat-xvid-example-settings"><systemitem class="library">Xvid</systemitem></link>
   should make it possible to get the same quality with CQ ranging from
   0.18 to 0.20 for a 1 CD rip, and 0.24 to 0.26 for a 2 CD rip.
   With MPEG-4 ASP codecs such as <systemitem class="library">x264</systemitem>,
@@ -1379,7 +1379,7 @@ Do not do this! Always use a file or CD/DVD/etc device as input.
   when choosing MPEG-4 AVC codecs like
   <systemitem class="library">x264</systemitem> instead of MPEG-4 ASP codecs
   such as <systemitem class="library">libavcodec</systemitem> MPEG-4 or
-  <systemitem class="library">XviD</systemitem>.
+  <systemitem class="library">Xvid</systemitem>.
   (Advanced codec developers may be interested in reading Michael
   Niedermayer's opinion on
   "<ulink url="http://guru.multimedia.cx/?p=10">why MPEG4-ASP sucks</ulink>".)
@@ -1404,7 +1404,7 @@ Do not do this! Always use a file or CD/DVD/etc device as input.
   As a result, most only support MPEG-1 (like VCD, XVCD and KVCD), MPEG-2
   (like DVD, SVCD and KVCD) and MPEG-4 ASP (like DivX,
   <systemitem class="library">libavcodec</systemitem>'s LMP4 and
-  <systemitem class="library">XviD</systemitem>)
+  <systemitem class="library">Xvid</systemitem>)
   (Beware: Usually, not all MPEG-4 ASP features are supported).
   Please refer to the technical specs of your player (if they are available),
   or google around for more information.
@@ -1414,7 +1414,7 @@ Do not do this! Always use a file or CD/DVD/etc device as input.
   <emphasis role="bold">Best quality per encoding time</emphasis>:
   Codecs that have been around for some time (such as
   <systemitem class="library">libavcodec</systemitem> MPEG-4 and
-  <systemitem class="library">XviD</systemitem>) are usually heavily
+  <systemitem class="library">Xvid</systemitem>) are usually heavily
   optimized with all kinds of smart algorithms and SIMD assembly code.
   That is why they tend to yield the best quality per encoding time ratio.
   However, they may have some very advanced options that, if enabled,
@@ -1432,7 +1432,7 @@ Do not do this! Always use a file or CD/DVD/etc device as input.
   <systemitem class="library">libavcodec</systemitem> MPEG-4 does
   allow that, but speed gains are limited, and there is a slight
   negative effect on picture quality.
-  <systemitem class="library">XviD</systemitem>'s multi-threaded encoding,
+  <systemitem class="library">Xvid</systemitem>'s multi-threaded encoding,
   activated by the <option>threads</option> option, can be used to
   boost encoding speed &mdash; by about 40-60% in typical cases &mdash;
   with little if any picture degradation.
@@ -1445,7 +1445,7 @@ Do not do this! Always use a file or CD/DVD/etc device as input.
   <emphasis role="bold">Personal taste</emphasis>:
   This is where it gets almost irrational: For the same reason that some
   hung on to DivX&nbsp;3 for years when newer codecs were already doing wonders,
-  some folks will prefer <systemitem class="library">XviD</systemitem>
+  some folks will prefer <systemitem class="library">Xvid</systemitem>
   or <systemitem class="library">libavcodec</systemitem> MPEG-4 over
   <systemitem class="library">x264</systemitem>.
   </para>
@@ -2383,7 +2383,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, XviD compatible)
+  ISO standard MPEG-4 (DivX, Xvid compatible)
   </entry></row>
 <row><entry>msmpeg4</entry><entry>
   pre-standard MPEG-4 variant by MS, v3 (AKA DivX3)
@@ -2913,10 +2913,10 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
 
 
 <sect1 id="menc-feat-xvid">
-<title>Encoding with the <systemitem class="library">XviD</systemitem>
+<title>Encoding with the <systemitem class="library">Xvid</systemitem>
 codec</title>
 <para>
- <systemitem class="library">XviD</systemitem> is a free library for
+ <systemitem class="library">Xvid</systemitem> is a free library for
  encoding MPEG-4 ASP video streams.
  Before starting to encode, you need to <link linkend="xvid">
  set up <application>MEncoder</application> to support it</link>.
@@ -2935,19 +2935,19 @@ codec</title>
 
 <para>
  Please begin by reviewing the
- <systemitem class="library">XviD</systemitem> section of
+ <systemitem class="library">Xvid</systemitem> section of
  <application>MPlayer</application>'s man page.
  This section is intended to be a supplement to the man page.
 </para>
 <para>
- The XviD default settings are already a good tradeoff between
+ The Xvid default settings are already a good tradeoff between
  speed and quality, therefore you can safely stick to them if
  the following section puzzles you.
 </para>
 </sect2>
 
 <sect2 id="menc-feat-xvid-encoding-options">
-<title>Encoding options of <systemitem class="library">XviD</systemitem></title>
+<title>Encoding options of <systemitem class="library">Xvid</systemitem></title>
 
 <itemizedlist>
 <listitem><para>
@@ -3105,7 +3105,7 @@ codec</title>
     encoding (as well as decoding).
     Therefore, you should only use it when you have turned
     <option>vhq</option> to the maximum.
-    <systemitem class="library">XviD</systemitem>'s GMC is more
+    <systemitem class="library">Xvid</systemitem>'s GMC is more
     sophisticated than DivX's, but is only supported by few
     standalone players.
 </para></listitem>
@@ -3116,8 +3116,8 @@ codec</title>
 <sect2 id="menc-feat-xvid-encoding-profiles">
 <title>Encoding profiles</title>
 <para>
-  XviD supports encoding profiles through the <option>profile</option> option,
-  which are used to impose restrictions on the properties of the XviD video
+  Xvid supports encoding profiles through the <option>profile</option> option,
+  which are used to impose restrictions on the properties of the Xvid video
   stream such that it will be playable on anything which supports the
   chosen profile.
   The restrictions relate to resolutions, bitrates and certain MPEG-4
diff --git a/DOCS/xml/en/faq.xml b/DOCS/xml/en/faq.xml
index ada263893f..c71998f5a8 100644
--- a/DOCS/xml/en/faq.xml
+++ b/DOCS/xml/en/faq.xml
@@ -1181,7 +1181,7 @@ MPEG-4 codec, whereas DX50 and XVID both mean full MPEG-4 (ASP).
 Therefore, if you change the FourCC to DIVX, some bad software or
 hardware players may choke on some advanced features that
 <systemitem class="library">libavcodec</systemitem> supports, but DivX
-doesn't; on the other hand <systemitem class="library">XviD</systemitem>
+doesn't; on the other hand <systemitem class="library">Xvid</systemitem>
 is closer to <systemitem class="library">libavcodec</systemitem> in
 terms of functionality, and is supported by all decent players.
 </para></answer>
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 6a0f68a04e..77c2958b8d 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -84,7 +84,7 @@ Video codecs:
   </row>
   <row>
     <entry>xvid</entry>
-    <entry>XviD, MPEG-4 Advanced Simple Profile (ASP) codec</entry>
+    <entry>Xvid, MPEG-4 Advanced Simple Profile (ASP) codec</entry>
   </row>
   <row>
     <entry>x264</entry>
@@ -524,7 +524,7 @@ or more JPEG, PNG or TGA files. With simple framecopy it can create MJPEG
   </para></listitem>
 <listitem><para>
   <application>MEncoder</application> then feeds the decoded image to the
-  chosen video compressor (DivX4, XviD, FFmpeg msmpeg4, etc.).
+  chosen video compressor (DivX4, Xvid, FFmpeg msmpeg4, etc.).
   </para></listitem>
 </orderedlist>