RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cosmetics: XviD --> Xvid 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-05-27 12:41:27 +00:00
parent 3447bd1d05
commit 8ac2b7bbf5
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AUTHORS
View File

@ -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)

2
DOCS/tech/MAINTAINERS
View File

@ -134,7 +134,7 @@ streams:
codec support:
* FFmpeg: Michael Niedermayer
* XviD: Ivan Kalvachev
* Xvid: Ivan Kalvachev
* x264: Loren Merritt
* musepack, speex: Reimar Döffinger

2
DOCS/tech/encoding-guide.txt
View File

@ -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

2
DOCS/tech/encoding-tips.txt
View File

@ -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.

10
configure vendored
View File

@ -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 */

2
etc/codecs.conf
View File

@ -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

6
libmpcodecs/vd_xvid4.c
View File

@ -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>",

12
libmpcodecs/ve_xvid4.c
View File

@ -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",