]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conferenc...
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 14 Apr 2017 23:57:48 +0000 (18:57 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 14 Apr 2017 23:57:48 +0000 (18:57 -0500)
src/mod/applications/mod_conference/conference_video.c

index 6de8049067d80500caffc177342be46a6ba056b4..cc9d36ea69ba254d6010fdc66e03ca1037e6dc91 100644 (file)
@@ -2932,7 +2932,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                        int seen = conference_utils_member_test_flag(imember, MFLAG_CAN_BE_SEEN);
 
                        if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO_READY) &&
-                               !conference_utils_member_test_flag(imember, MFLAG_SECOND_SCREEN) && imember->video_layer_id > -1 && 
+                               !conference_utils_member_test_flag(imember, MFLAG_SECOND_SCREEN) && 
                                conference_utils_member_test_flag(imember, MFLAG_RUNNING) && (!no_muted || seen) && (!no_av || (no_av && !imember->avatar_png_img))
                                && imember->canvas_id == canvas->canvas_id && imember->video_media_flow != SWITCH_MEDIA_FLOW_SENDONLY && imember->video_media_flow != SWITCH_MEDIA_FLOW_INACTIVE) {
                                video_count++;