CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv10672 Modified Files: gl_common.c gl_common.h vo_gl.c Log Message: More consistent and sane types. Also avoids some gcc 4 warnings. Index: gl_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/gl_common.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gl_common.c 3 Oct 2005 14:25:04 -0000 1.31 +++ gl_common.c 31 Oct 2005 13:56:16 -0000 1.32 @@ -154,7 +154,7 @@ * \return 1 if format is supported by OpenGL, 0 if not. * \ingroup gltexture */ -int glFindFormat(uint32_t fmt, uint32_t *bpp, GLint *gl_texfmt, +int glFindFormat(uint32_t fmt, int *bpp, GLint *gl_texfmt, GLenum *gl_format, GLenum *gl_type) { int supported = 1; @@ -478,7 +478,7 @@ * \ingroup gltexture */ void glUploadTex(GLenum target, GLenum format, GLenum type, - const char *data, int stride, + const void *data, int stride, int x, int y, int w, int h, int slice) { int y_max = y + h; if (w <= 0 || h <= 0) return; Index: gl_common.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/gl_common.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gl_common.h 1 Oct 2005 12:49:28 -0000 1.21 +++ gl_common.h 31 Oct 2005 13:56:16 -0000 1.22 @@ -184,7 +184,7 @@ const char *glValName(GLint value); -int glFindFormat(uint32_t format, uint32_t *bpp, GLint *gl_texfmt, +int glFindFormat(uint32_t format, int *bpp, GLint *gl_texfmt, GLenum *gl_format, GLenum *gl_type); int glFmt2bpp(GLenum format, GLenum type); void glCreateClearTex(GLenum target, GLenum fmt, GLint filter, @@ -192,7 +192,7 @@ int glCreatePPMTex(GLenum target, GLenum fmt, GLint filter, FILE *f, int *width, int *height, int *maxval); void glUploadTex(GLenum target, GLenum format, GLenum type, - const char *data, int stride, + const void *data, int stride, int x, int y, int w, int h, int slice); void glDrawTex(GLfloat x, GLfloat y, GLfloat w, GLfloat h, GLfloat tx, GLfloat ty, GLfloat tw, GLfloat th, Index: vo_gl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- vo_gl.c 13 Oct 2005 19:15:30 -0000 1.105 +++ vo_gl.c 31 Oct 2005 13:56:16 -0000 1.106 @@ -88,8 +88,8 @@ static int eq_ggamma = 0; static int eq_bgamma = 0; -static uint32_t texture_width; -static uint32_t texture_height; +static int texture_width; +static int texture_height; static unsigned int slice_height = 1; @@ -615,7 +615,7 @@ } static uint32_t draw_image(mp_image_t *mpi) { - char *data = mpi->planes[0]; + unsigned char *data = mpi->planes[0]; int slice = slice_height; if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) return VO_TRUE;