summaryrefslogtreecommitdiffstats
path: root/libvo/vo_gl.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-31 13:56:16 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-31 13:56:16 +0000
commit1b6809f32699b1bc0943efd5810f260147ca56ec (patch)
treef061a82b99c645b24791b39afb1b2b3b9f348254 /libvo/vo_gl.c
parent69c3235dfef1490a8e462ab10c12c11bc5c55d6c (diff)
downloadmpv-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/vo_gl.c')
-rw-r--r--libvo/vo_gl.c6
1 files changed, 3 insertions, 3 deletions
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;