]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8683: [mod_conference] fix seg originating non video call into mcu video conference
authorMichael Jerris <mike@jerris.com>
Wed, 30 Dec 2015 21:42:02 +0000 (16:42 -0500)
committerMichael Jerris <mike@jerris.com>
Wed, 30 Dec 2015 21:42:02 +0000 (16:42 -0500)
src/mod/applications/mod_conference/conference_video.c

index a955477ac0a16db1023e280c1cb83c054148bdc6..031f8f33573f5a228689bc1a7a13f6baf37ca907 100644 (file)
@@ -2595,8 +2595,9 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                int i = 0;
                                mcu_layer_t *floor_layer = NULL;
                                
-                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO || switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY) ||
-                                       switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
+                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO) ||
+                                       (switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY) ||
+                                       (switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS)) {
                                        continue;
                                }