Mercurial > mplayer.hg

changeset 6855:fb56a6c15dca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix silly shorthand that could cause trouble porting
author rfelker
date Wed, 31 Jul 2002 05:23:09 +0000
parents ded48a755830
children 23221df30608
files libvo/spuenc.c libvo/spuenc.h
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/spuenc.c	Tue Jul 30 23:09:24 2002 +0000
+++ b/libvo/spuenc.c	Wed Jul 31 05:23:09 2002 +0000
@@ -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 ) {
--- a/libvo/spuenc.h	Tue Jul 30 23:09:24 2002 +0000
+++ b/libvo/spuenc.h	Wed Jul 31 05:23:09 2002 +0000
@@ -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;