]> git.sesse.net Git - vlc/commitdiff
AVI demux: kill config_Get
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 30 Dec 2009 19:45:06 +0000 (21:45 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 30 Dec 2009 19:50:44 +0000 (21:50 +0200)
modules/demux/avi/avi.c

index 338e4fefeb5fcfffb67bc0d3b17267f8e30e0e3c..b477893ea10514b4c8f135d7b5522f38d365a25c 100644 (file)
@@ -267,7 +267,8 @@ static int Open( vlc_object_t * p_this )
     p_demux->pf_demux = Demux_Seekable;
 
     /* For unseekable stream, automaticaly use Demux_UnSeekable */
-    if( !p_sys->b_seekable || config_GetInt( p_demux, "avi-interleaved" ) )
+    if( !p_sys->b_seekable
+     || var_InheritInteger( p_demux, "avi-interleaved" ) )
     {
         p_demux->pf_demux = Demux_UnSeekable;
     }
@@ -654,7 +655,7 @@ static int Open( vlc_object_t * p_this )
         goto error;
     }
 
-    i_do_index =  config_GetInt( p_demux, "avi-index" );
+    i_do_index = var_InheritInteger( p_demux, "avi-index" );
     if( i_do_index == 1 ) /* Always fix */
     {
 aviindex: