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
d921e92a
Commit
d921e92a
authored
Jun 06, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a race condition in video filter wrapper.
parent
00af33b4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
modules/video_filter/wrapper.c
modules/video_filter/wrapper.c
+7
-7
No files found.
modules/video_filter/wrapper.c
View file @
d921e92a
...
@@ -305,11 +305,13 @@ static int Init( vout_thread_t *p_vout )
...
@@ -305,11 +305,13 @@ static int Init( vout_thread_t *p_vout )
VoutsClean
(
p_vout
,
i
);
VoutsClean
(
p_vout
,
i
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
}
/* Attach once pp_vout is completly field to avoid race conditions */
for
(
int
i
=
0
;
i
<
p_splitter
->
i_output
;
i
++
)
vout_filter_SetupChild
(
p_vout
,
p_sys
->
pp_vout
[
i
],
vout_filter_SetupChild
(
p_vout
,
p_sys
->
pp_vout
[
i
],
MouseEvent
,
MouseEvent
,
FullscreenEventUp
,
FullscreenEventDown
,
true
);
FullscreenEventUp
,
FullscreenEventDown
,
true
);
}
}
}
vout_filter_AllocateDirectBuffers
(
p_vout
,
VOUT_MAX_PICTURES
);
vout_filter_AllocateDirectBuffers
(
p_vout
,
VOUT_MAX_PICTURES
);
...
@@ -380,21 +382,19 @@ static void VoutsClean( vout_thread_t *p_vout, int i_count )
...
@@ -380,21 +382,19 @@ static void VoutsClean( vout_thread_t *p_vout, int i_count )
{
{
vout_sys_t
*
p_sys
=
p_vout
->
p_sys
;
vout_sys_t
*
p_sys
=
p_vout
->
p_sys
;
/* Detach all vouts before destroying them */
for
(
int
i
=
0
;
i
<
i_count
;
i
++
)
for
(
int
i
=
0
;
i
<
i_count
;
i
++
)
{
{
if
(
p_sys
->
p_chain
)
if
(
p_sys
->
p_chain
)
{
assert
(
i
==
0
);
vout_filter_DelChild
(
p_vout
,
p_sys
->
pp_vout
[
i
],
MouseEvent
);
vout_filter_DelChild
(
p_vout
,
p_sys
->
pp_vout
[
i
],
MouseEvent
);
}
else
else
{
vout_filter_SetupChild
(
p_vout
,
p_sys
->
pp_vout
[
i
],
vout_filter_SetupChild
(
p_vout
,
p_sys
->
pp_vout
[
i
],
MouseEvent
,
MouseEvent
,
FullscreenEventUp
,
FullscreenEventDown
,
false
);
FullscreenEventUp
,
FullscreenEventDown
,
false
);
}
vout_CloseAndRelease
(
p_sys
->
pp_vout
[
i
]
);
}
}
for
(
int
i
=
0
;
i
<
i_count
;
i
++
)
vout_CloseAndRelease
(
p_sys
->
pp_vout
[
i
]
);
}
}
static
int
VoutsNewPicture
(
vout_thread_t
*
p_vout
,
picture_t
*
pp_dst
[]
)
static
int
VoutsNewPicture
(
vout_thread_t
*
p_vout
,
picture_t
*
pp_dst
[]
)
{
{
...
...
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