Mercurial > mplayer.hg

diff libvo/gl_common.c @ 16879:6ea220b10e8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More consistent and sane types. Also avoids some gcc 4 warnings.
author reimar
date Mon, 31 Oct 2005 13:56:16 +0000
parents 5e3e86e8c9b4
children 179a7a2857a8
line wrap: on
line diff
--- a/libvo/gl_common.c	Mon Oct 31 08:41:41 2005 +0000
+++ b/libvo/gl_common.c	Mon Oct 31 13:56:16 2005 +0000
@@ -154,7 +154,7 @@
  * \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 @@
  * \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;