From 8ac2b7bbf5995968b045ab88c22cb2730b1c88e2 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 27 May 2008 12:41:27 +0000 Subject: cosmetics: XviD --> Xvid git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_xvid4.c | 6 +++--- libmpcodecs/ve_xvid4.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'libmpcodecs') 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 * 2003-2004 Edouard Gomez @@ -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 , Edouard Gomez ", "Marco Belli , Edouard Gomez ", 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 * 2003-2004 Edouard Gomez @@ -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 , Edouard Gomez ", "No comment", -- cgit v1.2.3