diff options
| -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 | ||||
| -rw-r--r-- | libmpcodecs/vd_xvid4.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/ve_xvid4.c | 12 |
8 files changed, 21 insertions, 21 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] @@ -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 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 diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c index c144043946..bbb99b5d4f 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 6b50885647..39b2a545db 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", |