Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
fafb5347
Commit
fafb5347
authored
Aug 21, 2014
by
Rafaël Carré
Browse files
Now that sout-all is default, make --programs take precedence over it
parent
9a76128f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/input/input.c
View file @
fafb5347
...
...
@@ -1126,11 +1126,6 @@ static void InitPrograms( input_thread_t * p_input )
{
char
*
prgms
;
if
(
var_GetBool
(
p_input
,
"sout-all"
)
)
{
i_es_out_mode
=
ES_OUT_MODE_ALL
;
}
else
if
(
(
prgms
=
var_GetNonEmptyString
(
p_input
,
"programs"
))
!=
NULL
)
{
char
*
buf
;
...
...
@@ -1150,6 +1145,10 @@ static void InitPrograms( input_thread_t * p_input )
free
(
prgms
);
}
else
if
(
var_GetBool
(
p_input
,
"sout-all"
)
)
{
i_es_out_mode
=
ES_OUT_MODE_ALL
;
}
}
es_out_SetMode
(
p_input
->
p
->
p_es_out
,
i_es_out_mode
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment