Revert commit r26897.

XviD is the correct spelling of the codec. 
You can see it written in the codec own 
documentation and header files.

Prefered name capitalization confirmed 
in conversation with XviD developer (prunedtree).



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

8 files changed, 21 insertions, 21 deletions

diff --git a/AUTHORS b/AUTHORS
index e3a873ef63..59e85e4f53 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -335,7 +335,7 @@ Gritsenko, Andriy N. (AG_LS) <andrej@lucky.net>
 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 @@ Poettering, Lennart <mzzcynlre@0pointer.de>
 
 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 @@ Svoboda, Jiří (zar) <Jiri.Svoboda@seznam.cz>
 
 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 --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 96e58a60b2..65e5c2f76f 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -134,7 +134,7 @@ streams:
 
 codec support:
     * FFmpeg: Michael Niedermayer
-    * Xvid: Ivan Kalvachev
+    * XviD: Ivan Kalvachev
     * x264: Loren Merritt
     * musepack, speex: Reimar Döffinger
 
diff --git a/DOCS/tech/encoding-guide.txt b/DOCS/tech/encoding-guide.txt
index 0393bcbb5f..5073c7c89b 100644
--- a/DOCS/tech/encoding-guide.txt
+++ b/DOCS/tech/encoding-guide.txt
@@ -122,7 +122,7 @@ during the first pass. However, sometimes it is beneficial to watch
 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 --git a/DOCS/tech/encoding-tips.txt b/DOCS/tech/encoding-tips.txt
index 9096f1f84e..9c9e5ddd87 100644
--- a/DOCS/tech/encoding-tips.txt
+++ b/DOCS/tech/encoding-tips.txt
@@ -304,7 +304,7 @@ This way it apeared that the minimum bits per block is ~40, very
 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 --git a/configure b/configure
index 7f1b4e4cd2..5771169a57 100755
--- a/configure
+++ b/configure
@@ -286,8 +286,8 @@ Codecs:
   --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]
@@ -6533,7 +6533,7 @@ fi
 echores "$_libdv"
 
 
-echocheck "Xvid"
+echocheck "XviD"
 if test "$_xvid" = auto ; then
   _xvid=no
   cat > $TMPC << EOF
@@ -6554,7 +6554,7 @@ else
 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>
@@ -7936,7 +7936,7 @@ $_def_hpux_scsi_h
    -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 --git a/etc/codecs.conf b/etc/codecs.conf
index fe41f3353c..8c1d7098bc 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -700,7 +700,7 @@ videocodec ffwv1f
   out YV12,I420,IYUV flip
 
 videocodec xvid
-  info "Xvid (MPEG-4)"
+  info "XviD (MPEG-4)"
   status working
   fourcc FMP4,fmp4
   fourcc DIVX,divx
diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c
index bbb99b5d4f..c144043946 100644
--- a/libmpcodecs/vd_xvid4.c
+++ b/libmpcodecs/vd_xvid4.c
@@ -1,5 +1,5 @@
 /*
- * - Xvid 1.x decoder module for mplayer/mencoder -
+ * - XviD 1.x decoder module for mplayer/mencoder -
  *
  * Copyright(C) 2003      Marco Belli <elcabesa@inwind.it>
  *              2003-2004 Edouard Gomez <ed.gomez@free.fr>
@@ -170,7 +170,7 @@ static int init(sh_video_t *sh)
 
 	/* Get a decoder instance */
 	if(xvid_decore(0, XVID_DEC_CREATE, &dec_p, NULL)<0) {
-		mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Xvid init failed\n");
+		mp_msg(MSGT_DECVIDEO, MSGL_ERR, "XviD init failed\n");
 		return 0;
 	}
 
@@ -380,7 +380,7 @@ static float stats2aspect(xvid_dec_stats_t *stats)
 
 static vd_info_t info = 
 {
-	"Xvid 1.0 decoder",
+	"XviD 1.0 decoder",
 	"xvid",
 	"Marco Belli <elcabesa@inwind.it>, Edouard Gomez <ed.gomez@free.fr>",
 	"Marco Belli <elcabesa@inwind.it>, Edouard Gomez <ed.gomez@free.fr>",
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index 39b2a545db..6b50885647 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -1,5 +1,5 @@
 /*
- * - Xvid 1.x decoder module for mplayer/mencoder -
+ * - XviD 1.x decoder module for mplayer/mencoder -
  *
  * Copyright(C) 2003      Marco Belli <elcabesa@inwind.it>
  *              2003-2004 Edouard Gomez <ed.gomez@free.fr>
@@ -96,7 +96,7 @@ typedef const struct
 	unsigned int flags;          ///< flags for allowed options/dxn note the definitions for PROFILE_S and PROFILE_AS
 } profile_t;
 
-// Code taken from Xvid VfW source for profile support
+// Code taken from XviD VfW source for profile support
 
 /* default vbv_occupancy is (64/170)*vbv_buffer_size */
 
@@ -390,7 +390,7 @@ config(struct vf_instance_s* vf,
 
 	/* Message the FourCC type */
 	mp_msg(MSGT_MENCODER, MSGL_INFO,
-	       "videocodec: Xvid (%dx%d fourcc=%x [%.4s])\n",
+	       "videocodec: XviD (%dx%d fourcc=%x [%.4s])\n",
 	       width, height, mod->mux->bih->biCompression,
 	       (char *)&mod->mux->bih->biCompression);
 
@@ -398,7 +398,7 @@ config(struct vf_instance_s* vf,
 	mod->pixels = mod->mux->bih->biWidth*mod->mux->bih->biHeight;
 
 	/*--------------------------------------------------------------------
-	 * Dispatch all module settings to Xvid structures
+	 * Dispatch all module settings to XviD structures
 	 *------------------------------------------------------------------*/
 
 	mod->d_width = d_width;
@@ -617,7 +617,7 @@ vf_open(vf_instance_t *vf, char* args)
 	mod->mux->bih->biBitCount = 12;
 	mod->mux->bih->biCompression = mmioFOURCC('X','V','I','D');
 
-	/* Retrieve information about the host Xvid library */
+	/* Retrieve information about the host XviD library */
 	memset(&xvid_gbl_info, 0, sizeof(xvid_gbl_info_t));
 	xvid_gbl_info.version = XVID_VERSION;
 
@@ -1515,7 +1515,7 @@ static const char *errorstring(int err)
  ****************************************************************************/
 
 vf_info_t ve_info_xvid = {
-	"Xvid 1.0 encoder",
+	"XviD 1.0 encoder",
 	"xvid",
 	"Marco Belli <elcabesa@inwind.it>, Edouard Gomez <ed.gomez@free.fr>",
 	"No comment",