# HG changeset patch
# User diego
# Date 1212251882 0
# Node ID 13061a6174b607d5911cfdd6768b7f639a8c58e8
# Parent  f0d0b666ee35e83e542e69a4b17c940625233ad2
Change spelling of XviD to Xvid as has already been done in the (rest of the)
documentation. The name change was effected a few years ago already.

diff -r f0d0b666ee35 -r 13061a6174b6 AUTHORS
--- a/AUTHORS	Sat May 31 13:42:09 2008 +0000
+++ b/AUTHORS	Sat May 31 16:38:02 2008 +0000
@@ -335,7 +335,7 @@
 Guyomarch, Rémi (rguyom) <rguyom@pobox.com>
     * various fixes
     * unsharp video filter
-    * XviD encoding support
+    * Xvid encoding support
 
 Hall, Julian <jules@meridiandigital.co.uk>
     * black frame detection filter (vf_blackframe)
@@ -642,7 +642,7 @@
 
 Poirier, Guillaume (poirierg) <poirierg@gmail.com>
     * French documentation translation and synchronization
-    * XviD documentation
+    * Xvid documentation
     * libavcodec turbo mode
     * lots of updates of MEncoder's documentation
     * code fixes to support GCC-4.0
@@ -751,7 +751,7 @@
 
 Swain, Robert <robert.swain@gmail.com>
     * CQM support and turbo multipass mode in x264 interface
-    * Profile support in XviD interface
+    * Profile support in Xvid interface
 
 Syrjälä, Ville <syrjala@sci.fi>
     * -vo dfbmga driver (G400 DVDMax-like feature using dfb 0.9.14)
diff -r f0d0b666ee35 -r 13061a6174b6 DOCS/tech/MAINTAINERS
--- a/DOCS/tech/MAINTAINERS	Sat May 31 13:42:09 2008 +0000
+++ b/DOCS/tech/MAINTAINERS	Sat May 31 16:38:02 2008 +0000
@@ -134,7 +134,7 @@
 
 codec support:
     * FFmpeg: Michael Niedermayer
-    * XviD: Ivan Kalvachev
+    * Xvid: Ivan Kalvachev
     * x264: Loren Merritt
     * musepack, speex: Reimar Döffinger
 
diff -r f0d0b666ee35 -r 13061a6174b6 DOCS/tech/encoding-guide.txt
--- a/DOCS/tech/encoding-guide.txt	Sat May 31 13:42:09 2008 +0000
+++ b/DOCS/tech/encoding-guide.txt	Sat May 31 16:38:02 2008 +0000
@@ -122,7 +122,7 @@
 the first-pass file before beginning the second pass to make sure
 nothing went wrong in the encoding.
 
-Next, an example using XviD instead of libavcodec:
+Next, an example using Xvid instead of libavcodec:
 
   Encoding from an existing AVI file
   500 kbit/sec MPEG-4 video
diff -r f0d0b666ee35 -r 13061a6174b6 DOCS/tech/encoding-tips.txt
--- a/DOCS/tech/encoding-tips.txt	Sat May 31 13:42:09 2008 +0000
+++ b/DOCS/tech/encoding-tips.txt	Sat May 31 16:38:02 2008 +0000
@@ -304,7 +304,7 @@
 good results are with ~50, and everything above 60 is a waste of bandwidth.
 And what's actually funny is that it was independent of codec used. The
 results were exactly the same, whether I used DIV3 (with tricky nandub's
-magick), ffmpeg odivx, DivX5 on Windows or XviD.
+magick), ffmpeg odivx, DivX5 on Windows or Xvid.
 
 Surprisingly there is one advantage of using nandub-DIV3 for bitrate
 starved encoding: ringing almost never apears this way.
diff -r f0d0b666ee35 -r 13061a6174b6 configure
--- a/configure	Sat May 31 13:42:09 2008 +0000
+++ b/configure	Sat May 31 16:38:02 2008 +0000
@@ -286,8 +286,8 @@
   --disable-qtx             disable QuickTime codecs support [enabled]
   --disable-xanim           disable XAnim codecs support [enabled]
   --disable-real            disable RealPlayer codecs support [enabled]
-  --disable-xvid            disable XviD [autodetect]
-  --disable-xvid-lavc       disable XviD in libavcodec [autodetect]
+  --disable-xvid            disable Xvid [autodetect]
+  --disable-xvid-lavc       disable Xvid in libavcodec [autodetect]
   --disable-x264            disable x264 [autodetect]
   --disable-x264-lavc       disable x264 in libavcodec [autodetect]
   --disable-libnut          disable libnut [autodetect]
@@ -6549,7 +6549,7 @@
 echores "$_libdv"
 
 
-echocheck "XviD"
+echocheck "Xvid"
 if test "$_xvid" = auto ; then
   _xvid=no
   cat > $TMPC << EOF
@@ -6570,7 +6570,7 @@
 fi
 echores "$_xvid"
 
-echocheck "XviD two pass plugin"
+echocheck "Xvid two pass plugin"
 if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then
   cat > $TMPC << EOF
 #include <xvid.h>
@@ -7952,7 +7952,7 @@
    -cache <kilobytes> */
 $_def_stream_cache
 
-/* Define if you are using XviD library */
+/* Define if you are using Xvid library */
 $_def_xvid
 
 /* Define if you are using the X.264 library */
diff -r f0d0b666ee35 -r 13061a6174b6 etc/codecs.conf
--- a/etc/codecs.conf	Sat May 31 13:42:09 2008 +0000
+++ b/etc/codecs.conf	Sat May 31 16:38:02 2008 +0000
@@ -700,7 +700,7 @@
   out YV12,I420,IYUV flip
 
 videocodec xvid
-  info "XviD (MPEG-4)"
+  info "Xvid (MPEG-4)"
   status working
   fourcc FMP4,fmp4
   fourcc DIVX,divx