diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-31 13:56:16 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-31 13:56:16 +0000 |
| commit | 1b6809f32699b1bc0943efd5810f260147ca56ec (patch) | |
| tree | f061a82b99c645b24791b39afb1b2b3b9f348254 /libvo/gl_common.c | |
| parent | 69c3235dfef1490a8e462ab10c12c11bc5c55d6c (diff) | |
| download | mpv-1b6809f32699b1bc0943efd5810f260147ca56ec.tar.bz2 mpv-1b6809f32699b1bc0943efd5810f260147ca56ec.tar.xz | |
More consistent and sane types. Also avoids some gcc 4 warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16880 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/gl_common.c')
| -rw-r--r-- | libvo/gl_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 3aeb27c361..1f0a354a93 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -154,7 +154,7 @@ const char *glValName(GLint value) * \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 @@ int glFmt2bpp(GLenum format, GLenum type) { * \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; |