Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
9119f4fa
Commit
9119f4fa
authored
Nov 04, 2008
by
sebastien
Committed by
Rémi Denis-Courmont
Nov 04, 2008
Browse files
input_DetachSout corrections
Signed-off-by:
Rémi Denis-Courmont
<
rdenis@simphalempin.com
>
parent
77b33ced
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/input/input.c
View file @
9119f4fa
...
...
@@ -490,6 +490,7 @@ void input_StopThread( input_thread_t *p_input )
sout_instance_t
*
input_DetachSout
(
input_thread_t
*
p_input
)
{
assert
(
p_input
->
b_dead
);
sout_instance_t
*
p_sout
=
p_input
->
p
->
p_sout
;
vlc_object_detach
(
p_sout
);
p_input
->
p
->
p_sout
=
NULL
;
...
...
src/input/vlm.c
View file @
9119f4fa
...
...
@@ -768,8 +768,8 @@ static void vlm_MediaInstanceDelete( vlm_media_instance_sys_t *p_instance )
if
(
p_input
)
{
input_StopThread
(
p_input
);
p_instance
->
p_sout
=
input_DetachSout
(
p_input
);
vlc_thread_join
(
p_input
);
p_instance
->
p_sout
=
input_DetachSout
(
p_input
);
vlc_object_release
(
p_input
);
}
if
(
p_instance
->
p_sout
)
...
...
@@ -846,8 +846,8 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
}
input_StopThread
(
p_input
);
p_instance
->
p_sout
=
input_DetachSout
(
p_input
);
vlc_thread_join
(
p_input
);
p_instance
->
p_sout
=
input_DetachSout
(
p_input
);
vlc_object_release
(
p_input
);
if
(
!
p_instance
->
b_sout_keep
&&
p_instance
->
p_sout
)
{
...
...
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