MKV: kill warnings.

modules/demux/mkv/demux.cpp

@@ -284,8 +284,6 @@ void * demux_sys_t::EventThread( vlc_object_t *p_this )
         /* KEY part */
         if( p_ev->i_key_action )
         {
-            int i;
-
             msg_Dbg( p_ev->p_demux, "Handle Key Event");
 
             vlc_mutex_lock( &p_ev->lock );

modules/demux/mkv/matroska_segment.cpp

@@ -87,7 +87,6 @@ void matroska_segment_c::LoadCues( KaxCues *cues )
 {
     EbmlParser  *ep;
     EbmlElement *el;
-    size_t i, j;
 
     if( b_cues )
     {
@@ -187,7 +186,6 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
 {
     EbmlParser  *ep;
     EbmlElement *el;
-    size_t i, j;
 
     /* Master elements */
     ep = new EbmlParser( &es, tags, &sys.demuxer );
@@ -597,8 +595,6 @@ int matroska_segment_c::BlockFindTrackIndex( size_t *pi_track,
                                              const KaxBlock *p_block, const KaxSimpleBlock *p_simpleblock )
 {
     size_t          i_track;
-    unsigned int    i;
-    bool            b;
 
     for( i_track = 0; i_track < tracks.size(); i_track++ )
     {

modules/demux/mkv/matroska_segment.hpp

@@ -42,14 +42,14 @@ public:
         ,i_timescale(MKVD_TIMECODESCALE)
         ,i_duration(-1)
         ,i_start_time(0)
+        ,i_seekhead_count(0)
+        ,i_seekhead_position(-1)
         ,i_cues_position(-1)
+        ,i_tracks_position(-1)
         ,i_info_position(-1)
         ,i_chapters_position(-1)
         ,i_tags_position(-1)
-        ,i_tracks_position(-1)
         ,i_attachments_position(-1)
-        ,i_seekhead_position(-1)
-        ,i_seekhead_count(0)
         ,cluster(NULL)
         ,i_block_pos(0)
         ,i_cluster_pos(0)
@@ -159,28 +159,5 @@ public:
     static bool CompareSegmentUIDs( const matroska_segment_c * item_a, const matroska_segment_c * item_b );
 };
 
-/**
- * Helper function to print the mkv parse tree
- */
-static void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ... )
-{
-    va_list args;
-    if( i_level > 9 )
-    {
-        msg_Err( &demuxer, "too deep tree" );
-        return;
-    }
-    va_start( args, psz_format );
-    static const char psz_foo[] = "|   |   |   |   |   |   |   |   |   |";
-    char *psz_foo2 = (char*)malloc( i_level * 4 + 3 + strlen( psz_format ) );
-    strncpy( psz_foo2, psz_foo, 4 * i_level );
-    psz_foo2[ 4 * i_level ] = '+';
-    psz_foo2[ 4 * i_level + 1 ] = ' ';
-    strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format );
-    __msg_GenericVa( VLC_OBJECT(&demuxer),VLC_MSG_DBG, "mkv", psz_foo2, args );
-    free( psz_foo2 );
-    va_end( args );
-}
-
 
 #endif

modules/demux/mkv/matroska_segment_parse.cpp

@@ -35,8 +35,6 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead )
 {
     EbmlParser  *ep;
     EbmlElement *l;
-    size_t i, j;
-    int i_upper_level = 0;
     bool b_seekable;
 
     i_seekhead_count++;
@@ -125,6 +123,31 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead )
     delete ep;
 }
 
+
+/**
+ * Helper function to print the mkv parse tree
+ */
+static void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ... )
+{
+    va_list args;
+    if( i_level > 9 )
+    {
+        msg_Err( &demuxer, "too deep tree" );
+        return;
+    }
+    va_start( args, psz_format );
+    static const char psz_foo[] = "|   |   |   |   |   |   |   |   |   |";
+    char *psz_foo2 = (char*)malloc( i_level * 4 + 3 + strlen( psz_format ) );
+    strncpy( psz_foo2, psz_foo, 4 * i_level );
+    psz_foo2[ 4 * i_level ] = '+';
+    psz_foo2[ 4 * i_level + 1 ] = ' ';
+    strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format );
+    __msg_GenericVa( VLC_OBJECT(&demuxer),VLC_MSG_DBG, "mkv", psz_foo2, args );
+    free( psz_foo2 );
+    va_end( args );
+}
+
+
 /*****************************************************************************
  * ParseTrackEntry:
  *****************************************************************************/

modules/demux/mkv/mkv.cpp

@@ -278,7 +278,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     vlc_meta_t *p_meta;
     input_attachment_t ***ppp_attach;
     int *pi_int;
-    int i;
 
     switch( i_query )
     {
@@ -294,7 +293,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                                                         p_sys->stored_attachments.size() );
             if( !(*ppp_attach) )
                 return VLC_ENOMEM;
-            for( i = 0; i < p_sys->stored_attachments.size(); i++ )
+            for( size_t i = 0; i < p_sys->stored_attachments.size(); i++ )
             {
                 attachment_c *a = p_sys->stored_attachments[i];
                 (*ppp_attach)[i] = vlc_input_attachment_New( a->psz_file_name.c_str(), a->psz_mime_type.c_str(), NULL,