Mercurial > mplayer.hg
diff libvo/gl_common.h @ 16879:6ea220b10e8e
More consistent and sane types. Also avoids some gcc 4 warnings.
author | reimar |
---|---|
date | Mon, 31 Oct 2005 13:56:16 +0000 |
parents | 6b0dc40bf961 |
children | 724353364790 |
line wrap: on
line diff
--- a/libvo/gl_common.h Mon Oct 31 08:41:41 2005 +0000 +++ b/libvo/gl_common.h Mon Oct 31 13:56:16 2005 +0000 @@ -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,