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
f61dd9ff
Commit
f61dd9ff
authored
Oct 05, 2007
by
Ilkka Ollakka
Browse files
don't add empty mux= in sout-chain if no mux has been selected
parent
5f7bf43c
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/dialogs/sout.cpp
View file @
f61dd9ff
...
...
@@ -366,6 +366,13 @@ COUNT()
mrl.append( "dst=" ); \
}
#define CHECKMUX() \
if( sout.psz_mux ) \
{ \
mrl.append( ",mux=");\
mrl.append( sout.psz_mux ); \
}
if
(
trans
)
{
...
...
@@ -393,8 +400,8 @@ COUNT()
{
ISMORE
();
ATLEASTONE
()
mrl
.
append
(
"std{access=file
,mux=
"
);
mrl
.
append
(
sout
.
psz_mux
);
mrl
.
append
(
"std{access=file"
);
CHECKMUX
(
);
mrl
.
append
(
",dst="
);
mrl
.
append
(
sout
.
psz_file
);
mrl
.
append
(
"}"
);
...
...
@@ -405,8 +412,8 @@ COUNT()
{
ISMORE
();
ATLEASTONE
()
mrl
.
append
(
"std{access=http
,mux=
"
);
mrl
.
append
(
sout
.
psz_mux
);
mrl
.
append
(
"std{access=http"
);
CHECKMUX
(
);
mrl
.
append
(
",dst="
);
mrl
.
append
(
sout
.
psz_http
);
mrl
.
append
(
":"
);
...
...
@@ -419,8 +426,8 @@ COUNT()
{
ISMORE
();
ATLEASTONE
()
mrl
.
append
(
"std{access=mmsh
,mux=
"
);
mrl
.
append
(
sout
.
psz_mux
);
mrl
.
append
(
"std{access=mmsh"
);
CHECKMUX
(
);
mrl
.
append
(
",dst="
);
mrl
.
append
(
sout
.
psz_mms
);
mrl
.
append
(
":"
);
...
...
@@ -433,8 +440,8 @@ COUNT()
{
ISMORE
();
ATLEASTONE
()
mrl
.
append
(
"rtp{
mux=
"
);
mrl
.
append
(
sout
.
psz_mux
);
mrl
.
append
(
"rtp{"
);
CHECKMUX
(
);
mrl
.
append
(
",dst="
);
mrl
.
append
(
sout
.
psz_rtp
);
mrl
.
append
(
":"
);
...
...
@@ -447,8 +454,8 @@ COUNT()
{
ISMORE
();
ATLEASTONE
()
mrl
.
append
(
"std{access=udp
,mux=
"
);
mrl
.
append
(
sout
.
psz_mux
);
mrl
.
append
(
"std{access=udp"
);
CHECKMUX
(
);
mrl
.
append
(
",dst="
);
mrl
.
append
(
sout
.
psz_udp
);
mrl
.
append
(
":"
);
...
...
@@ -473,6 +480,8 @@ COUNT()
}
}
#undef CHECKMUX
if
(
sout
.
b_all_es
)
mrl
.
append
(
":sout-all"
);
...
...
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