summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-18 14:26:37 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-18 14:28:47 +0200
commit421bce00776f00cc0185ef65b82a6a4c8bcfd366 (patch)
tree0f97afa9b5ab11945d01a737df7cfbd337485059
parentf5a19f6328d04e3f5d68554aa59408e45ad03b5d (diff)
downloadmpv-421bce00776f00cc0185ef65b82a6a4c8bcfd366.tar.bz2
mpv-421bce00776f00cc0185ef65b82a6a4c8bcfd366.tar.xz
Revert "cocoa: perform init and uninit synchronously"
This reverts commit a0ac8b6331d345748d415cf71affbe7a90e336a6.
-rw-r--r--video/out/cocoa_common.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 0b1acdcce7..28a642f0df 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -95,7 +95,9 @@ static void with_cocoa_lock(struct vo *vo, void(^block)(void))
static void with_cocoa_lock_on_main_thread(struct vo *vo, void(^block)(void))
{
- dispatch_sync(dispatch_get_main_queue(), block);
+ dispatch_async(dispatch_get_main_queue(), ^{
+ with_cocoa_lock(vo, block);
+ });
}
static void queue_new_video_size(struct vo *vo, int w, int h)