diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-28 23:04:41 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-28 23:04:41 +0000 |
| commit | 08ec85ba4be2915e6ae9918344b4465de4ad37f5 (patch) | |
| tree | 6f2edb2accde81df7a32797ef98edc0b00098422 /libmpcodecs | |
| parent | 61b101497d19e94a33db26dc8c693d206945cf5c (diff) | |
| download | mpv-08ec85ba4be2915e6ae9918344b4465de4ad37f5.tar.bz2 mpv-08ec85ba4be2915e6ae9918344b4465de4ad37f5.tar.xz | |
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
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_xvid4.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/ve_xvid4.c | 12 |
2 files changed, 9 insertions, 9 deletions
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", |