diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 81265109e572c6f1bd89220e96435c79906f643e..d411ba47cc1d3c1b37fbd4f0c15395bb624047a9 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -77,7 +77,7 @@ typedef struct
 
 struct demux_sys_t
 {
-    mtime_t             i_time;     /* µs */
+    mtime_t             i_time;     /* s */
     mtime_t             i_length;   /* length of file file */
     int64_t             i_bitrate;  /* global file bitrate */
 
@@ -366,7 +366,7 @@ static int DemuxPacket( demux_t *p_demux )
     i_packet_send_time = GetDWLE( p_peek + i_skip ); i_skip += 4;
     i_packet_duration  = GetWLE( p_peek + i_skip ); i_skip += 2;
 
-//        i_packet_size_left = i_packet_length;   // XXX données reellement lu
+//        i_packet_size_left = i_packet_length;   // XXX donn�s reellement lu
     /* FIXME I have to do that for some file, I don't known why */
     i_packet_size_left = i_data_packet_min;
 
@@ -719,7 +719,8 @@ static int DemuxInit( demux_t *p_demux )
             if( p_sys->p_root->p_metadata )
             {
                 asf_object_metadata_t *p_meta = p_sys->p_root->p_metadata;
-                int i, i_aspect_x = 0, i_aspect_y = 0;
+                int i_aspect_x = 0, i_aspect_y = 0;
+                unsigned int i;
 
                 for( i = 0; i < p_meta->i_record_entries_count; i++ )
                 {
diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index ef3bd46d680e08287cb353061fc8f93e84e0f23e..6377a201244bf25e33521fa35c83cbbb580161c7 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -307,6 +307,9 @@ static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj )
 
     int i_peek, i_entries, i;
     uint8_t *p_peek;
+#ifdef ASF_DEBUG
+    unsigned int j;
+#endif
 
     p_meta->i_record_entries_count = 0;
     p_meta->record = 0;
@@ -401,9 +404,9 @@ static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj )
     msg_Dbg( s,
             "read \"metadata object\" %d entries",
             p_meta->i_record_entries_count );
-    for( i = 0; i < p_meta->i_record_entries_count; i++ )
+    for( j = 0; j < p_meta->i_record_entries_count; j++ )
     {
-        asf_metadata_record_t *p_rec = &p_meta->record[i];
+        asf_metadata_record_t *p_rec = &p_meta->record[j];
         
         if( p_rec->i_type == ASF_METADATA_TYPE_STRING )
             msg_Dbg( s, "  - %s=%s",