[Mplayer-cvslog] CVS: main cinepak.c,1.8,1.9

[Arpi of Ize]

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

Modified Files:
	cinepak.c 
Log Message:
x1!=mpi->width bug fixed... always trust in x1

Index: cinepak.c
===================================================================
RCS file: /cvsroot/mplayer/main/cinepak.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cinepak.c	3 Mar 2002 03:28:17 -0000	1.8
+++ cinepak.c	9 Mar 2002 22:07:22 -0000	1.9
@@ -667,9 +667,10 @@
 		y_bottom += y1;
 		top_size -= 12;
 		x = 0;
-		if(x1 != (unsigned int)mpi->width) 
-			mp_msg(MSGT_DECVIDEO, MSGL_WARN, "CVID: Warning x1 (%ld) != width (%d)\n", x1, mpi->width);
-x1 = mpi->width;
+//		if(x1 != (unsigned int)mpi->width) 
+//			mp_msg(MSGT_DECVIDEO, MSGL_WARN, "CVID: Warning x1 (%ld) != width (%d)\n", x1, mpi->width);
+
+//x1 = mpi->width;
 #if DBUG
 	mp_msg(MSGT_DECVIDEO, MSGL_WARN, "   %d) %04lx %04ld <%ld,%ld> <%ld,%ld> yt %ld  %d\n",
 		cur_strip, strip_id, top_size, x0, y0, x1, y1, y_bottom);
@@ -782,7 +783,7 @@
 								}
 
 							x += 4;
-							if(x >= (unsigned int)mpi->width)
+							if(x >= (unsigned int)x1)
 								{
 								x = 0;
 								y += 4;
@@ -832,7 +833,7 @@
 
 							mask >>= 1;
 							x += 4;
-							if(x >= (unsigned int)mpi->width)
+							if(x >= (unsigned int)x1)
 								{
 								x = 0;
 								y += 4;
@@ -849,7 +850,7 @@
 						cvid_v1(mpi, x, y, v1_codebook + get_byte());
 						chunk_size--;
 						x += 4;
-						if(x >= (unsigned int)mpi->width)
+						if(x >= (unsigned int)x1)
 							{
 							x = 0;
 							y += 4;