Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
456
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
c4d1a91a
Commit
c4d1a91a
authored
15 years ago
by
Pierre
Browse files
Options
Downloads
Patches
Plain Diff
qtcapture: Make sure we don't block on main thread at destruction.
parent
29847260
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/access/qtcapture.m
+5
-3
5 additions, 3 deletions
modules/access/qtcapture.m
with
5 additions
and
3 deletions
modules/access/qtcapture.m
+
5
−
3
View file @
c4d1a91a
...
...
@@ -351,9 +351,11 @@ static void Close( vlc_object_t *p_this )
* Else we dead lock. */
if
(
vlc_object_alive
(
p_this
->
p_libvlc
))
{
[
p_sys
->
session
stopRunning
];
[
p_sys
->
output
release
];
[
p_sys
->
session
release
];
// Perform this on main thread, as the framework itself will sometimes try to synchronously
// work on main thread. And this will create a dead lock.
[
p_sys
->
session
performSelectorOnMainThread
:
@selector
(
stopRunning
)
withObject
:
nil
waitUntilDone
:
NO
];
[
p_sys
->
output
performSelectorOnMainThread
:
@selector
(
release
)
withObject
:
nil
waitUntilDone
:
NO
];
[
p_sys
->
session
performSelectorOnMainThread
:
@selector
(
release
)
withObject
:
nil
waitUntilDone
:
NO
];
}
free
(
p_sys
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment