diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 13:34:55 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 13:34:55 +0000 |
| commit | 4f6a65ef4e4d0669eeda9d6d39373885e3c47329 (patch) | |
| tree | 246956d10f04060a34202601f6cd77500d0a9a3b /libvo | |
| parent | 42eecb4f1b879a85bc93ef5b45eeed21326359bb (diff) | |
| download | mpv-4f6a65ef4e4d0669eeda9d6d39373885e3c47329.tar.bz2 mpv-4f6a65ef4e4d0669eeda9d6d39373885e3c47329.tar.xz | |
Avoid void * arithmetic
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21217 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/gl_common.c | 5 | ||||
| -rw-r--r-- | libvo/gl_common.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 891d021925..ae28b79bfd 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -473,7 +473,7 @@ int glFmt2bpp(GLenum format, GLenum type) { * \param target texture target, usually GL_TEXTURE_2D * \param format OpenGL format of data * \param type OpenGL type of data - * \param data data to upload + * \param dataptr data to upload * \param stride data stride * \param x x offset in texture * \param y y offset in texture @@ -483,8 +483,9 @@ int glFmt2bpp(GLenum format, GLenum type) { * \ingroup gltexture */ void glUploadTex(GLenum target, GLenum format, GLenum type, - const void *data, int stride, + const void *dataptr, int stride, int x, int y, int w, int h, int slice) { + const uint8_t *data = dataptr; int y_max = y + h; if (w <= 0 || h <= 0) return; if (slice <= 0) diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 775adf2158..982d5551b7 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -212,7 +212,7 @@ void glCreateClearTex(GLenum target, GLenum fmt, GLint filter, 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 void *data, int stride, + const void *dataptr, 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, |