From 27c546ad1ee5398127806749640466344819c8c5 Mon Sep 17 00:00:00 2001 From: Andoni Morales Alastruey Date: Thu, 4 Apr 2013 15:59:09 +0000 Subject: [PATCH] avfvideosrc: fix deadlock draining queue from the same thread --- sys/applemedia/avfvideosrc.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/applemedia/avfvideosrc.m b/sys/applemedia/avfvideosrc.m index 236aa75508..3c570b1a68 100644 --- a/sys/applemedia/avfvideosrc.m +++ b/sys/applemedia/avfvideosrc.m @@ -601,7 +601,8 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer - (void)waitForQueueToDrain:(dispatch_queue_t)dispatchQueue { - dispatch_sync (dispatchQueue, ^{}); + if (dispatchQueue != dispatch_get_current_queue()) + dispatch_sync (dispatchQueue, ^{}); } @end