]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7513: remove extra mutex
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 13 Feb 2015 15:55:48 +0000 (09:55 -0600)
committerMichael Jerris <mike@jerris.com>
Thu, 28 May 2015 17:47:02 +0000 (12:47 -0500)
src/mod/applications/mod_conference/mod_conference.c

index 5caabe1c1edffef24d4cc64a95e1d915c3c5b41d..9533025d58e8709626def4c6b28ee2e1457dac09 100644 (file)
@@ -1192,7 +1192,6 @@ static switch_status_t attach_video_layer(conference_member_t *member, int idx)
        layer->member_id = member->id;
        member->video_layer_id = idx;
        check_used_layers(member->conference);
-       switch_mutex_unlock(member->conference->canvas->mutex);
 
        if (layer->geometry.audio_position) {
                conf_api_sub_position(member, NULL, layer->geometry.audio_position);
@@ -1200,7 +1199,6 @@ static switch_status_t attach_video_layer(conference_member_t *member, int idx)
 
 
        switch_color_set_rgb(&color, member->conference->video_layout_bgcolor);
-       switch_mutex_lock(member->conference->canvas->mutex);
        switch_img_fill(member->conference->canvas->img, layer->x_pos, layer->y_pos, layer->screen_w, layer->screen_h, &color);