From f68be9741998e707d3ddc34a6db1674ed2c23915 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 25 Aug 2005 12:45:57 +0000
Subject: [PATCH] Fix texture format variable types. Internal format is GLint,
 others are GLenum

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16304 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/gl_common.c | 5 +++--
 libvo/gl_common.h | 2 +-
 libvo/vo_gl.c     | 2 +-
 libvo/vo_gl2.c    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 1e22593dff..fcaac5f2a1 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -110,13 +110,14 @@ const char *glValName(GLint value)
  * \param gl_type [OUT] OpenGL type for this image format.
  * \return 1 if format is supported by OpenGL, 0 if not.
  */
-int glFindFormat(uint32_t fmt, uint32_t *bpp, GLenum *gl_texfmt,
+int glFindFormat(uint32_t fmt, uint32_t *bpp, GLint *gl_texfmt,
                   GLenum *gl_format, GLenum *gl_type)
 {
   int dummy1;
   GLenum dummy2;
+  GLint dummy3;
   if (bpp == NULL) bpp = &dummy1;
-  if (gl_texfmt == NULL) gl_texfmt = &dummy2;
+  if (gl_texfmt == NULL) gl_texfmt = &dummy3;
   if (gl_format == NULL) gl_format = &dummy2;
   if (gl_type == NULL) gl_type = &dummy2;
   
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 9d36e9f180..31792251c1 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -61,7 +61,7 @@ void glAdjustAlignment(int stride);
 
 const char *glValName(GLint value);
 
-int glFindFormat(uint32_t format, uint32_t *bpp, GLenum *gl_texfmt,
+int glFindFormat(uint32_t format, uint32_t *bpp, GLint *gl_texfmt,
                   GLenum *gl_format, GLenum *gl_type);
 int glFmt2bpp(GLenum format, GLenum type);
 void glCreateClearTex(GLenum target, GLenum fmt, GLint filter,
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 3bdd2b0aba..a857afec0d 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -64,7 +64,7 @@ static int many_fmts;
 static int use_glFinish;
 static int swap_interval;
 static GLenum gl_target;
-static GLenum gl_texfmt;
+static GLint gl_texfmt;
 static GLenum gl_format;
 static GLenum gl_type;
 static GLint gl_buffer;
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 4af5a4a9aa..ac405a8960 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -64,8 +64,8 @@ static int texnumx, texnumy, raw_line_len;
 static struct TexSquare * texgrid = NULL;
 static GLint    gl_internal_format;
 static int      rgb_sz, r_sz, g_sz, b_sz, a_sz;
-static GLint    gl_bitmap_format;
-static GLint    gl_bitmap_type;
+static GLenum   gl_bitmap_format;
+static GLenum   gl_bitmap_type;
 static int      isGL12 = GL_FALSE;
 
 static int      gl_bilinear=1;