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
7804b040
Commit
7804b040
authored
Oct 21, 2010
by
Sébastien Escudier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
live555 : remove timeout thread before closing rtsp session
parent
ffd3fce0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
modules/demux/live555.cpp
modules/demux/live555.cpp
+7
-6
No files found.
modules/demux/live555.cpp
View file @
7804b040
...
...
@@ -443,6 +443,13 @@ static void Close( vlc_object_t *p_this )
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
if
(
p_sys
->
p_timeout
)
{
vlc_cancel
(
p_sys
->
p_timeout
->
handle
);
vlc_join
(
p_sys
->
p_timeout
->
handle
,
NULL
);
free
(
p_sys
->
p_timeout
);
}
if
(
p_sys
->
rtsp
&&
p_sys
->
ms
)
p_sys
->
rtsp
->
sendTeardownCommand
(
*
p_sys
->
ms
,
NULL
);
if
(
p_sys
->
ms
)
Medium
::
close
(
p_sys
->
ms
);
if
(
p_sys
->
rtsp
)
RTSPClient
::
close
(
p_sys
->
rtsp
);
...
...
@@ -460,12 +467,6 @@ static void Close( vlc_object_t *p_this )
if
(
p_sys
->
i_track
)
free
(
p_sys
->
track
);
if
(
p_sys
->
p_out_asf
)
stream_Delete
(
p_sys
->
p_out_asf
);
if
(
p_sys
->
p_timeout
)
{
vlc_cancel
(
p_sys
->
p_timeout
->
handle
);
vlc_join
(
p_sys
->
p_timeout
->
handle
,
NULL
);
free
(
p_sys
->
p_timeout
);
}
delete
p_sys
->
scheduler
;
free
(
p_sys
->
p_sdp
);
free
(
p_sys
->
psz_path
);
...
...
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