diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-31 16:38:02 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-31 16:38:02 +0000 |
commit | 6e478b9ea618968554ec7e6b3eccdef63a04dce1 (patch) | |
tree | f474d83466b8984a110e65ab1f0ada3558e5e07f | |
parent | 44111a3753a34e98fb4c14eff7d3ae15e6e9aee0 (diff) | |
download | mpv-6e478b9ea618968554ec7e6b3eccdef63a04dce1.tar.bz2 mpv-6e478b9ea618968554ec7e6b3eccdef63a04dce1.tar.xz |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26940 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | AUTHORS | 6 | ||||
-rw-r--r-- | DOCS/tech/MAINTAINERS | 2 | ||||
-rw-r--r-- | DOCS/tech/encoding-guide.txt | 2 | ||||
-rw-r--r-- | DOCS/tech/encoding-tips.txt | 2 | ||||
-rwxr-xr-x | configure | 10 | ||||
-rw-r--r-- | etc/codecs.conf | 2 |
6 files changed, 12 insertions, 12 deletions
@@ -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 65e5c2f76f..96e58a60b2 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 5073c7c89b..0393bcbb5f 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 9c9e5ddd87..9096f1f84e 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. @@ -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 */ diff --git a/etc/codecs.conf b/etc/codecs.conf index 8c1d7098bc..fe41f3353c 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 |