diff options
author | al3x <al3x@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-12 14:03:18 +0000 |
---|---|---|
committer | al3x <al3x@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-06-12 14:03:18 +0000 |
commit | 790fa570cfd79686934fe969300e2f00b5bbd780 (patch) | |
tree | b1e0b2d8d37c1144f7b539e7c0e59f7a7216163d | |
parent | fcb67ada2b890c61b726d3242765fe50a17f1224 (diff) |
-Wall like fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1110 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libvo/sub.c | 13 | ||||
-rw-r--r-- | libvo/vo_gl.c | 7 | ||||
-rw-r--r-- | libvo/vo_pgm.c | 1 | ||||
-rw-r--r-- | libvo/x11_common.c | 1 |
4 files changed, 8 insertions, 14 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index f410f8ad27..45521da278 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -32,7 +32,6 @@ int vo_osd_progbar_type=-1; int vo_osd_progbar_value=100; // 0..255 static void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ - int len=strlen(vo_osd_text); int i; int y=dys/2; int x; @@ -100,10 +99,8 @@ static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, i for(i=0;i<vo_sub->lines;i++){ unsigned char* text=vo_sub->text[i]; int len=strlen(text); - int j,k; + int j; int xsize=-vo_font->charspace; - int x=0; - int lastStripPosition=-1; int previousStrip=0; int lastxsize=0; @@ -119,7 +116,7 @@ static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, i lastxsize=xsize; } xsize+=w+vo_font->charspace; - if (dxs<xsize & lastStripPosition>0) + if (dxs<xsize && lastStripPosition>0) { xsize=lastxsize; j=lastStripPosition; @@ -153,7 +150,7 @@ static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, i lastxsize=xsize; } xsize+=w+vo_font->charspace; - if ((dxs<xsize & lastStripPosition>0)| j==len-1) + if ((dxs<xsize && lastStripPosition>0) || j==len-1) { if (j==len-1) lastStripPosition=len; else xsize=lastxsize; @@ -188,6 +185,8 @@ static void vo_draw_text_sub(int dxs,int dys,void (*draw_alpha)(int x0,int y0, i static int draw_alpha_init_flag=0; +extern void vo_draw_alpha_init(); + void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ if(!vo_font) return; // no font @@ -210,5 +209,3 @@ void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, } } - - diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index cec4c4f2f7..854de2614d 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -43,7 +43,7 @@ static vo_info_t vo_info = }; /* private prototypes */ -static void Display_Image (unsigned char *ImageData); +// static void Display_Image (unsigned char *ImageData); /* local data */ static unsigned char *ImageData=NULL; @@ -57,7 +57,7 @@ static Window mywindow; static XWindowAttributes attribs; static int X_already_started = 0; -static int texture_id=1; +//static int texture_id=1; static GLXContext wsGLXContext; //XVisualInfo * wsVisualInfo; @@ -105,7 +105,7 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3 XVisualInfo *vinfo; XEvent xev; - XGCValues xgcv; +// XGCValues xgcv; XSetWindowAttributes xswa; unsigned long xswamask; @@ -414,7 +414,6 @@ uint8_t *s=src[0]; uint8_t *de=&ImageData[3*image_width]; for(i=0;i<image_height;i++){ - int j; uint8_t *d=ImageData; while(d<de){ d[0]=s[2]; diff --git a/libvo/vo_pgm.c b/libvo/vo_pgm.c index dd75f70499..59fa446927 100644 --- a/libvo/vo_pgm.c +++ b/libvo/vo_pgm.c @@ -61,7 +61,6 @@ get_info(void) static void flip_page (void) { FILE * f; - int i; snprintf (vo_pgm_filename, 24, "%08d.pgm", framenum++); diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 8e6d77d102..9d4f30dea9 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -47,7 +47,6 @@ void vo_hidecursor ( Display *disp , Window win ) int vo_init( void ) { - int CompletionType = -1; // int mScreen; int bpp; // char * DisplayName = ":0.0"; |