Mercurial > mplayer.hg

comparison libvo/vo_gl.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 d9465442eef2
children 1267964a4dfa
comparison
equal deleted inserted replaced
16878:865ba529e6fd 16879:6ea220b10e8e
86 static int eq_hue = 0; 86 static int eq_hue = 0;
87 static int eq_rgamma = 0; 87 static int eq_rgamma = 0;
88 static int eq_ggamma = 0; 88 static int eq_ggamma = 0;
89 static int eq_bgamma = 0; 89 static int eq_bgamma = 0;
90 90
91 static uint32_t texture_width; 91 static int texture_width;
92 static uint32_t texture_height; 92 static int texture_height;
93 93
94 static unsigned int slice_height = 1; 94 static unsigned int slice_height = 1;
95 95
96 static void resize(int x,int y){ 96 static void resize(int x,int y){
97 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y); 97 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y);
613 mpi->flags |= MP_IMGFLAG_DIRECT; 613 mpi->flags |= MP_IMGFLAG_DIRECT;
614 return VO_TRUE; 614 return VO_TRUE;
615 } 615 }
616 616
617 static uint32_t draw_image(mp_image_t *mpi) { 617 static uint32_t draw_image(mp_image_t *mpi) {
618 char *data = mpi->planes[0]; 618 unsigned char *data = mpi->planes[0];
619 int slice = slice_height; 619 int slice = slice_height;
620 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) 620 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
621 return VO_TRUE; 621 return VO_TRUE;
622 if (mpi->flags & MP_IMGFLAG_DIRECT) { 622 if (mpi->flags & MP_IMGFLAG_DIRECT) {
623 data = NULL; 623 data = NULL;