[Mplayer-cvslog] CVS: main/libmpcodecs vd_xvid4.c,1.2,1.3

[Guillaume Poirier CVS]

CVS change done by Guillaume Poirier CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv5688

Modified Files:
	vd_xvid4.c 
Log Message:
Renames xvid_ini to xvid_gbl_init and dec_p to xvid_dec_create
That'll make the move to 1.1.x front-end smoother.


Index: vd_xvid4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_xvid4.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vd_xvid4.c	17 Feb 2004 12:52:19 -0000	1.2
+++ vd_xvid4.c	1 Oct 2004 22:50:47 -0000	1.3
@@ -86,15 +86,16 @@
 
 static int init(sh_video_t *sh)
 {
-	xvid_gbl_init_t xvid_ini;
-	xvid_dec_create_t dec_p;
+	xvid_gbl_init_t xvid_gbl_init;
+	xvid_dec_create_t xvid_dec_create;
 	priv_t* p;
 	int cs;
 
-	memset(&xvid_ini, 0, sizeof(xvid_gbl_init_t));
-	xvid_ini.version = XVID_VERSION;
-	memset(&dec_p, 0, sizeof(xvid_dec_create_t));
-	dec_p.version = XVID_VERSION;
+	memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init_t));
+	xvid_gbl_init.version = XVID_VERSION;
+
+	memset(&xvid_dec_create, 0, sizeof(xvid_dec_create_t));
+	xvid_dec_create.version = XVID_VERSION;
 
 	if(!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_YV12))
 		return(0);
@@ -135,20 +136,20 @@
 		return(0);
 	}
 
-	if(xvid_global(NULL, XVID_GBL_INIT, &xvid_ini, NULL))
+	if(xvid_global(NULL, XVID_GBL_INIT, &xvid_gbl_init, NULL))
 		return(0);
 
-	dec_p.width = sh->disp_w;
-	dec_p.height =  sh->disp_h;
+	xvid_dec_create.width = sh->disp_w;
+	xvid_dec_create.height =  sh->disp_h;
 
-	if(xvid_decore(0, XVID_DEC_CREATE, &dec_p, NULL)<0) {
+	if(xvid_decore(0, XVID_DEC_CREATE, &xvid_dec_create, NULL)<0) {
 		mp_msg(MSGT_DECVIDEO, MSGL_ERR, "XviD init failed\n");
 		return(0);
 	}
 
 	p = (priv_t*)malloc(sizeof(priv_t));
 	p->cs = cs;
-	p->hdl = dec_p.handle;
+	p->hdl = xvid_dec_create.handle;
 	sh->context = p;
 
 	switch(cs) {