]> 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>
Thu, 20 Apr 2017 21:41:53 +0000 (16:41 -0500)
committerMike Jerris <mike@jerris.com>
Thu, 1 Jun 2017 18:42:00 +0000 (14:42 -0400)
src/mod/applications/mod_conference/conference_video.c

index 33bd991db4fe29c6d33b2e1302173c29a59a69e3..605f9f9f9c3722dafa20c7de220c7066783c9663 100644 (file)
@@ -1403,7 +1403,7 @@ video_layout_t *conference_video_find_best_layout(conference_obj_t *conference,
                        break;
                }
 
-               if (vlnode->vlayout->layers - file_layers >= (int)count) {
+               if (vlnode->vlayout->layers - file_layers >= (int)count + file_count) {
                        if (!least || least->vlayout->layers > vlnode->vlayout->layers) {
                                least = vlnode;
                        }