From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 18 Aug 2017 01:01:16 +0000 (-0500)
Subject: FS-10561: [freeswitch-core,mod_conference] Video concurrency improvements for 1.8... 
X-Git-Tag: v1.8.0~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=079a04d1c2026d7311b0745f943c5b311cf5a2f2;p=thirdparty%2Ffreeswitch.git

FS-10561: [freeswitch-core,mod_conference] Video concurrency improvements for 1.8 -- fix locking regression part 2
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 67b963995a..42830624a1 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -1033,7 +1033,6 @@ void conference_video_detach_video_layer(conference_member_t *member)
 	}
 
 	switch_mutex_lock(canvas->mutex);
-	switch_mutex_lock(canvas->write_mutex);
 
 	if (member->video_layer_id < 0) {
 		goto end;
@@ -1080,7 +1079,6 @@ void conference_video_detach_video_layer(conference_member_t *member)
 
  end:
 
-	switch_mutex_unlock(canvas->write_mutex);
 	switch_mutex_unlock(canvas->mutex);
 	conference_video_release_canvas(&canvas);