diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-31 05:23:09 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-07-31 05:23:09 +0000 |
| commit | 11af8f4d32c60b1167ac788a962a962077c84ae6 (patch) | |
| tree | 0b323701af3c2a00a4492680356d09329c7f76ba /libvo | |
| parent | c1ce20d7a0ade0c0efecf603bb3f22543fa6cd4a (diff) | |
| download | mpv-11af8f4d32c60b1167ac788a962a962077c84ae6.tar.bz2 mpv-11af8f4d32c60b1167ac788a962a962077c84ae6.tar.xz | |
fix silly shorthand that could cause trouble porting
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6856 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/spuenc.c | 8 | ||||
| -rw-r--r-- | libvo/spuenc.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libvo/spuenc.c b/libvo/spuenc.c index a8efc7978a..e2cb9438ea 100644 --- a/libvo/spuenc.c +++ b/libvo/spuenc.c @@ -35,7 +35,7 @@ encode_do_control(int x,int y, encodedata* ed, pixbuf* pb) { 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 @@ encode_do_control(int x,int y, encodedata* ed, pixbuf* pb) { } 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 @@ encode_eol( encodedata* ed ) { 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 @@ void 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 ) { diff --git a/libvo/spuenc.h b/libvo/spuenc.h index f978de4d4b..b8dc5f0e4d 100644 --- a/libvo/spuenc.h +++ b/libvo/spuenc.h @@ -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; |