diff options
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/video_out_opengl.c | 4 | ||||
| -rw-r--r-- | src/video_out/video_out_xshm.c | 10 | ||||
| -rw-r--r-- | src/video_out/yuv2rgb.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 082febd75..1936c0455 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_opengl.c,v 1.57 2006/06/15 21:40:05 komadori Exp $ + * $Id: video_out_opengl.c,v 1.58 2006/06/20 01:07:58 dgp85 Exp $ * * video_out_opengl.c, OpenGL based interface for xine * @@ -945,7 +945,7 @@ static int render_setup_fp_yuv (opengl_driver_t *this) { ret = render_setup_tex2d (this); if (! this->has_fragprog) return 0; - if (this->fprog == -1) + if (this->fprog == (GLuint)-1) this->glGenProgramsARB (1, &this->fprog); this->glBindProgramARB (MYGL_FRAGMENT_PROGRAM_ARB, this->fprog); this->glProgramStringARB (MYGL_FRAGMENT_PROGRAM_ARB, diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index d28c2adc0..c2e6bd3bc 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_xshm.c,v 1.144 2006/06/02 22:18:59 dsalt Exp $ + * $Id: video_out_xshm.c,v 1.145 2006/06/20 01:07:58 dgp85 Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -595,7 +595,7 @@ static void xshm_update_frame_format (vo_driver_t *this_gen, static void xshm_overlay_clut_yuv2rgb(xshm_driver_t *this, vo_overlay_t *overlay, xshm_frame_t *frame) { - int i; + size_t i; clut_t* clut = (clut_t*) overlay->color; if (!overlay->rgb_clut) { @@ -1021,10 +1021,10 @@ static int ImlibPaletteLUTGet(xshm_driver_t *this) { &bytes_after, &retval); if (retval != 0 && num_ret > 0 && format_ret > 0) { if (format_ret == 8) { - int j, i, num_colors; + unsigned int i; + unsigned long j; - num_colors = retval[0]; - j = 1 + num_colors*4; + j = 1 + retval[0]*4; this->yuv2rgb_cmap = malloc(sizeof(uint8_t) * 32 * 32 * 32); for (i = 0; i < 32 * 32 * 32 && j < num_ret; i++) this->yuv2rgb_cmap[i] = retval[1+4*retval[j++]+3]; diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c index a8aa2d1fc..5fc04f688 100644 --- a/src/video_out/yuv2rgb.c +++ b/src/video_out/yuv2rgb.c @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: yuv2rgb.c,v 1.51 2004/04/11 12:25:35 komadori Exp $ + * $Id: yuv2rgb.c,v 1.52 2006/06/20 01:07:59 dgp85 Exp $ */ #include "config.h" @@ -1276,7 +1276,7 @@ static scale_line_func_t find_scale_line_func(int step) { { 1, 2, scale_line_1_2, "2*zoom" }, { 1, 1, scale_line_1_1, "non-scaled" }, }; - int i; + size_t i; #ifdef LOG /* to filter out multiple messages about the scale_line variant we're using */ static int reported_for_step; |