git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0a24da4
)
AVI demux: kill config_Get
author
Rémi Denis-Courmont
<remi@remlab.net>
Wed, 30 Dec 2009 19:45:06 +0000
(21:45 +0200)
committer
Rémi Denis-Courmont
<remi@remlab.net>
Wed, 30 Dec 2009 19:50:44 +0000
(21:50 +0200)
modules/demux/avi/avi.c
patch
|
blob
|
history
diff --git
a/modules/demux/avi/avi.c
b/modules/demux/avi/avi.c
index
338e4fe
..
b477893
100644
(file)
--- a/
modules/demux/avi/avi.c
+++ b/
modules/demux/avi/avi.c
@@
-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 */
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;
}
{
p_demux->pf_demux = Demux_UnSeekable;
}
@@
-654,7
+655,7
@@
static int Open( vlc_object_t * p_this )
goto error;
}
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:
if( i_do_index == 1 ) /* Always fix */
{
aviindex: