]> git.sesse.net Git - vlc/commitdiff
Screen-win32: Kill warnings
authorJean-Baptiste Kempf <jb@videolan.org>
Thu, 20 Aug 2009 08:19:34 +0000 (10:19 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 20 Aug 2009 08:53:52 +0000 (10:53 +0200)
"signed and unsigned type in conditional expression"

modules/access/screen/win32.c

index 01cac097c9d8711324ea49465ffc669950ef2a04..87eb6fbfb1f1bcc93ae8a6f6861976e1d553ef1d 100644 (file)
@@ -187,9 +187,9 @@ static block_t *CaptureBlockNew( demux_t *p_demux )
         p_data->bmi.bmiHeader.biClrImportant = 0;
 
         i_val = var_CreateGetInteger( p_demux, "screen-fragment-size" );
-        p_data->i_fragment_size = i_val > 0 ? i_val : p_sys->fmt.video.i_height;
-        p_data->i_fragment_size = i_val > p_sys->fmt.video.i_height ?
-                                            p_sys->fmt.video.i_height :
+        p_data->i_fragment_size = i_val > 0 ? i_val : (int)p_sys->fmt.video.i_height;
+        p_data->i_fragment_size = i_val > (int)p_sys->fmt.video.i_height ?
+                                            (int)p_sys->fmt.video.i_height :
                                             p_data->i_fragment_size;
         p_sys->f_fps *= (p_sys->fmt.video.i_height/p_data->i_fragment_size);
         p_sys->i_incr = 1000000 / p_sys->f_fps;