[Mplayer-cvslog] CVS: main/opendivx global.h,1.2,1.3 mp4_mblock.c,1.3,1.4 mp4_recon.c,1.2,1.3

[Arpi of Ize]

Update of /cvsroot/mplayer/main/opendivx
In directory mplayer:/var/tmp.root/cvs-serv24473

Modified Files:
	global.h mp4_mblock.c mp4_recon.c 
Log Message:
reconstruct renamed (conflict with g723x)

Index: global.h
===================================================================
RCS file: /cvsroot/mplayer/main/opendivx/global.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- global.h	11 Mar 2001 02:32:51 -0000	1.2
+++ global.h	28 Dec 2001 23:49:19 -0000	1.3
@@ -64,7 +64,7 @@
 void init_idct (void);
 
 // recon.c 
-void reconstruct (int bx, int by, int mode);
+void odivx_reconstruct (int bx, int by, int mode);
 
 // mp4_picture.c
 void PictureDisplay (unsigned char *bmp, int render_flag);

Index: mp4_mblock.c
===================================================================
RCS file: /cvsroot/mplayer/main/opendivx/mp4_mblock.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mp4_mblock.c	15 Mar 2001 23:19:32 -0000	1.3
+++ mp4_mblock.c	28 Dec 2001 23:49:19 -0000	1.4
@@ -120,7 +120,7 @@
 		// motion compensation
 		if (interFlag) 
 		{
-			reconstruct(mp4_hdr.mb_xpos, mp4_hdr.mb_ypos, mp4_hdr.derived_mb_type);
+			odivx_reconstruct(mp4_hdr.mb_xpos, mp4_hdr.mb_ypos, mp4_hdr.derived_mb_type);
 
 			// texture decoding add
 			for (j = 0; j < 6; j++) {
@@ -160,7 +160,7 @@
 
 		modemap[mp4_hdr.mb_ypos+1][mp4_hdr.mb_xpos+1] = NOT_CODED; // [Review] used only in P-VOPs
 
-		reconstruct(mp4_hdr.mb_xpos, mp4_hdr.mb_ypos, mp4_hdr.derived_mb_type);
+		odivx_reconstruct(mp4_hdr.mb_xpos, mp4_hdr.mb_ypos, mp4_hdr.derived_mb_type);
 	}
 
 	quant_store[mp4_hdr.mb_ypos+1][mp4_hdr.mb_xpos+1] = mp4_hdr.quantizer;

Index: mp4_recon.c
===================================================================
RCS file: /cvsroot/mplayer/main/opendivx/mp4_recon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mp4_recon.c	25 May 2001 17:26:07 -0000	1.2
+++ mp4_recon.c	28 Dec 2001 23:49:19 -0000	1.3
@@ -44,7 +44,7 @@
 
 /***/
 
-void reconstruct (int bx, int by, int mode)
+void odivx_reconstruct (int bx, int by, int mode)
 {
   int w, h, lx, dx, dy, xp, yp, comp, sum;
   int x, y, px, py;