From 1b6809f32699b1bc0943efd5810f260147ca56ec Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 31 Oct 2005 13:56:16 +0000
Subject: 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
---
 libvo/gl_common.c | 4 ++--
 libvo/gl_common.h | 4 ++--
 libvo/vo_gl.c     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libvo')

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;
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index fe73ecc73a..ca8399c5fa 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -184,7 +184,7 @@ void glAdjustAlignment(int stride);
 
 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 @@ 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 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,
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 77dae80ec9..431bd7f4e5 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -88,8 +88,8 @@ static int eq_rgamma = 0;
 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 get_image(mp_image_t *mpi) {
 }
 
 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;
-- 
cgit v1.2.3