ASF/WMV: parser chapters

[vlc] / modules / demux / flac.c

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index d7da7aa9e07fcfaba71c5aaddc32168834388886..6c5755f266e76eddc00b04b55431c934314623c5 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -400,14 +400,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         input_attachment_t ***ppp_attach =
             (input_attachment_t***)va_arg( args, input_attachment_t*** );
         int *pi_int = (int*)va_arg( args, int * );
-        int i;
 
         if( p_sys->i_attachments <= 0 )
             return VLC_EGENERIC;
 
-        *pi_int = p_sys->i_attachments;;
+        *pi_int = p_sys->i_attachments;
         *ppp_attach = xmalloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
-        for( i = 0; i < p_sys->i_attachments; i++ )
+        for( int i = 0; i < p_sys->i_attachments; i++ )
             (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
         return VLC_SUCCESS;
     }
@@ -579,7 +578,7 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
     if( i_data < 4 )
         return;
 
-    vorbis_ParseComment( &p_sys->p_meta, &p_data[4], i_data - 4 );
+    vorbis_ParseComment( &p_sys->p_meta, &p_data[4], i_data - 4, NULL, NULL );
 
 }