[MPlayer-cvslog] r26940 - in trunk: AUTHORS DOCS/tech/MAINTAINERS DOCS/tech/encoding-guide.txt DOCS/tech/encoding-tips.txt configure etc/codecs.conf

[diego]

Author: diego
Date: Sat May 31 18:38:02 2008
New Revision: 26940

Log:
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.


Modified:
   trunk/AUTHORS
   trunk/DOCS/tech/MAINTAINERS
   trunk/DOCS/tech/encoding-guide.txt
   trunk/DOCS/tech/encoding-tips.txt
   trunk/configure
   trunk/etc/codecs.conf

Modified: trunk/AUTHORS
==============================================================================
--- trunk/AUTHORS	(original)
+++ trunk/AUTHORS	Sat May 31 18:38:02 2008
@@ -335,7 +335,7 @@ Gritsenko, Andriy N. (AG_LS) <andrej at luc
 Guyomarch, Rémi (rguyom) <rguyom at pobox.com>
     * various fixes
     * unsharp video filter
-    * XviD encoding support
+    * Xvid encoding support
 
 Hall, Julian <jules at meridiandigital.co.uk>
     * black frame detection filter (vf_blackframe)
@@ -642,7 +642,7 @@ Poettering, Lennart <mzzcynlre at 0pointer.
 
 Poirier, Guillaume (poirierg) <poirierg at 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 at sezn
 
 Swain, Robert <robert.swain at 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 at sci.fi>
     * -vo dfbmga driver (G400 DVDMax-like feature using dfb 0.9.14)

Modified: trunk/DOCS/tech/MAINTAINERS
==============================================================================
--- trunk/DOCS/tech/MAINTAINERS	(original)
+++ trunk/DOCS/tech/MAINTAINERS	Sat May 31 18:38:02 2008
@@ -134,7 +134,7 @@ streams:
 
 codec support:
     * FFmpeg: Michael Niedermayer
-    * XviD: Ivan Kalvachev
+    * Xvid: Ivan Kalvachev
     * x264: Loren Merritt
     * musepack, speex: Reimar Döffinger
 

Modified: trunk/DOCS/tech/encoding-guide.txt
==============================================================================
--- trunk/DOCS/tech/encoding-guide.txt	(original)
+++ trunk/DOCS/tech/encoding-guide.txt	Sat May 31 18:38:02 2008
@@ -122,7 +122,7 @@ during the first pass. However, sometime
 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

Modified: trunk/DOCS/tech/encoding-tips.txt
==============================================================================
--- trunk/DOCS/tech/encoding-tips.txt	(original)
+++ trunk/DOCS/tech/encoding-tips.txt	Sat May 31 18:38:02 2008
@@ -304,7 +304,7 @@ This way it apeared that the minimum bit
 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.

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sat May 31 18:38:02 2008
@@ -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]
@@ -6549,7 +6549,7 @@ fi
 echores "$_libdv"
 
 
-echocheck "XviD"
+echocheck "Xvid"
 if test "$_xvid" = auto ; then
   _xvid=no
   cat > $TMPC << EOF
@@ -6570,7 +6570,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>
@@ -7952,7 +7952,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 */

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Sat May 31 18:38:02 2008
@@ -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