Unsigned casts

modules/demux/aiff.c

@@ -158,7 +158,7 @@ static int Open( vlc_object_t *p_this )
             }
 
             p_sys->i_ssnd_pos = stream_Tell( p_demux->s );
-            p_sys->i_ssnd_size= i_size;
+            p_sys->i_ssnd_size = i_size;
             p_sys->i_ssnd_offset = GetDWBE( &p_peek[8] );
             p_sys->i_ssnd_blocksize = GetDWBE( &p_peek[12] );
 
@@ -172,7 +172,8 @@ static int Open( vlc_object_t *p_this )
         }
 
         /* Skip this chunk */
-        if( stream_Read( p_demux->s, NULL, i_size + 8 ) != i_size + 8 )
+        i_size += 8;
+        if( stream_Read( p_demux->s, NULL, i_size ) != (int)i_size )
         {
             msg_Warn( p_demux, "incomplete file" );
             goto error;

modules/demux/mkv.cpp

@@ -2572,8 +2572,10 @@ int demux_sys_t::EventThread( vlc_object_t *p_this )
                 {
                     btni_t *button_ptr = &(pci->hli.btnit[button-1]);
 
-                    if((valx.i_int >= button_ptr->x_start) && (valx.i_int <= button_ptr->x_end) &&
-                       (valy.i_int >= button_ptr->y_start) && (valy.i_int <= button_ptr->y_end)) 
+                    if(((unsigned)valx.i_int >= button_ptr->x_start)
+                     && ((unsigned)valx.i_int <= button_ptr->x_end)
+                     && ((unsigned)valy.i_int >= button_ptr->y_start)
+                     && ((unsigned)valy.i_int <= button_ptr->y_end)) 
                     {
                         mx = (button_ptr->x_start + button_ptr->x_end)/2;
                         my = (button_ptr->y_start + button_ptr->y_end)/2;