Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
bf19c970
Commit
bf19c970
authored
Jul 20, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redumdant boolean
parent
96f5cc4d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+5
-9
No files found.
modules/stream_out/rtp.c
View file @
bf19c970
...
@@ -247,7 +247,6 @@ struct sout_stream_sys_t
...
@@ -247,7 +247,6 @@ struct sout_stream_sys_t
vlc_mutex_t
lock_sdp
;
vlc_mutex_t
lock_sdp
;
/* SDP to disk */
/* SDP to disk */
bool
b_export_sdp_file
;
char
*
psz_sdp_file
;
char
*
psz_sdp_file
;
/* SDP via SAP */
/* SDP via SAP */
...
@@ -352,8 +351,6 @@ static int Open( vlc_object_t *p_this )
...
@@ -352,8 +351,6 @@ static int Open( vlc_object_t *p_this )
p_sys
->
i_port_video
=
var_GetInteger
(
p_stream
,
SOUT_CFG_PREFIX
"port-video"
);
p_sys
->
i_port_video
=
var_GetInteger
(
p_stream
,
SOUT_CFG_PREFIX
"port-video"
);
p_sys
->
rtcp_mux
=
var_GetBool
(
p_stream
,
SOUT_CFG_PREFIX
"rtcp-mux"
);
p_sys
->
rtcp_mux
=
var_GetBool
(
p_stream
,
SOUT_CFG_PREFIX
"rtcp-mux"
);
p_sys
->
psz_sdp_file
=
NULL
;
if
(
p_sys
->
i_port_audio
&&
p_sys
->
i_port_video
==
p_sys
->
i_port_audio
)
if
(
p_sys
->
i_port_audio
&&
p_sys
->
i_port_video
==
p_sys
->
i_port_audio
)
{
{
msg_Err
(
p_stream
,
"audio and video RTP port must be distinct"
);
msg_Err
(
p_stream
,
"audio and video RTP port must be distinct"
);
...
@@ -446,8 +443,8 @@ static int Open( vlc_object_t *p_this )
...
@@ -446,8 +443,8 @@ static int Open( vlc_object_t *p_this )
p_sys
->
psz_sdp
=
NULL
;
p_sys
->
psz_sdp
=
NULL
;
p_sys
->
b_export_sap
=
false
;
p_sys
->
b_export_sap
=
false
;
p_sys
->
b_export_sdp_file
=
false
;
p_sys
->
p_session
=
NULL
;
p_sys
->
p_session
=
NULL
;
p_sys
->
psz_sdp_file
=
NULL
;
p_sys
->
p_httpd_host
=
NULL
;
p_sys
->
p_httpd_host
=
NULL
;
p_sys
->
p_httpd_file
=
NULL
;
p_sys
->
p_httpd_file
=
NULL
;
...
@@ -596,7 +593,7 @@ static void Close( vlc_object_t * p_this )
...
@@ -596,7 +593,7 @@ static void Close( vlc_object_t * p_this )
free
(
p_sys
->
psz_sdp
);
free
(
p_sys
->
psz_sdp
);
if
(
p_sys
->
b_export_sdp_file
)
if
(
p_sys
->
psz_sdp_file
!=
NULL
)
{
{
#ifdef HAVE_UNISTD_H
#ifdef HAVE_UNISTD_H
unlink
(
p_sys
->
psz_sdp_file
);
unlink
(
p_sys
->
psz_sdp_file
);
...
@@ -658,12 +655,11 @@ static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url )
...
@@ -658,12 +655,11 @@ static void SDPHandleUrl( sout_stream_t *p_stream, const char *psz_url )
}
}
else
if
(
url
.
psz_protocol
&&
!
strcasecmp
(
url
.
psz_protocol
,
"file"
)
)
else
if
(
url
.
psz_protocol
&&
!
strcasecmp
(
url
.
psz_protocol
,
"file"
)
)
{
{
if
(
p_sys
->
b_export_sdp_file
)
if
(
p_sys
->
psz_sdp_file
!=
NULL
)
{
{
msg_Err
(
p_stream
,
"you can use sdp=file:// only once"
);
msg_Err
(
p_stream
,
"you can use sdp=file:// only once"
);
goto
out
;
goto
out
;
}
}
p_sys
->
b_export_sdp_file
=
true
;
psz_url
=
&
psz_url
[
5
];
psz_url
=
&
psz_url
[
5
];
if
(
psz_url
[
0
]
==
'/'
&&
psz_url
[
1
]
==
'/'
)
if
(
psz_url
[
0
]
==
'/'
&&
psz_url
[
1
]
==
'/'
)
psz_url
+=
2
;
psz_url
+=
2
;
...
@@ -1293,7 +1289,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
...
@@ -1293,7 +1289,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
/* Update SDP (sap/file) */
/* Update SDP (sap/file) */
if
(
p_sys
->
b_export_sap
)
SapSetup
(
p_stream
);
if
(
p_sys
->
b_export_sap
)
SapSetup
(
p_stream
);
if
(
p_sys
->
b_export_sdp_file
)
FileSetup
(
p_stream
);
if
(
p_sys
->
psz_sdp_file
!=
NULL
)
FileSetup
(
p_stream
);
return
id
;
return
id
;
...
@@ -1336,7 +1332,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
...
@@ -1336,7 +1332,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
/* Update SDP (sap/file) */
/* Update SDP (sap/file) */
if
(
p_sys
->
b_export_sap
&&
!
p_sys
->
p_mux
)
SapSetup
(
p_stream
);
if
(
p_sys
->
b_export_sap
&&
!
p_sys
->
p_mux
)
SapSetup
(
p_stream
);
if
(
p_sys
->
b_export_sdp_file
)
FileSetup
(
p_stream
);
if
(
p_sys
->
psz_sdp_file
!=
NULL
)
FileSetup
(
p_stream
);
vlc_object_detach
(
id
);
vlc_object_detach
(
id
);
vlc_object_release
(
id
);
vlc_object_release
(
id
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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