[Mplayer-cvslog] CVS: main/libvo spuenc.h,1.1,1.2 spuenc.c,1.2,1.3

[Richard Felker CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv13753/libvo

Modified Files:
	spuenc.h spuenc.c 
Log Message:
fix silly shorthand that could cause trouble porting


Index: spuenc.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/spuenc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spuenc.h	3 Apr 2002 10:05:35 -0000	1.1
+++ spuenc.h	31 Jul 2002 05:23:09 -0000	1.2
@@ -25,12 +25,12 @@
 
 typedef struct {
 	int x, y;
-	u_int rgb[4];
-	u_char* pixels;
+	unsigned int rgb[4];
+	unsigned char* pixels;
 } pixbuf;
 
 typedef struct {
-	u_char data[DATASIZE];
+	unsigned char data[DATASIZE];
 	int count;	/* the count of bytes written */
 	int oddstart;
 	int nibblewaiting;

Index: spuenc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/spuenc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- spuenc.c	4 Apr 2002 16:35:03 -0000	1.2
+++ spuenc.c	31 Jul 2002 05:23:09 -0000	1.3
@@ -35,7 +35,7 @@
 	int controlstart= ed->count;
 	int x1;
 	int i;
-	u_int top, left, bottom, right;
+	unsigned int top, left, bottom, right;
 
 	top= 450 - pb->y/2;
    	left=(720 / 2) - (pb->x / 2);
@@ -138,7 +138,7 @@
 }
 
 static void
-encode_put_nibble( encodedata* ed, u_char nibble ) {
+encode_put_nibble( encodedata* ed, unsigned char nibble ) {
 	if( ed->nibblewaiting ) {
 		ed->data[ed->count++]|= nibble;
 		ed->nibblewaiting= 0;
@@ -175,7 +175,7 @@
 static void
 encode_do_row( encodedata* ed, pixbuf* pb, int row ) {
 	int i= 0;
-	u_char* pix= pb->pixels + row * pb->x;
+	unsigned char* pix= pb->pixels + row * pb->x;
 	int color= *pix;
 	int n= 0; /* the number of pixels of this color */
 	
@@ -237,7 +237,7 @@
 pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) {
 	int colors, chrs, l, n; 
 	char c[4], table[256];
-	u_char *b, *i;
+	unsigned char *b, *i;
 
 	sscanf( xpm[0], "%d %d %d %d", &pb->x, &pb->y, &colors, &chrs);
 	if( colors > 4 ) {