FS-10225: [mod_conference] Incorrect layout chosen when playing a file in a conference with a layout group -- fix regression when playing files into a group layout

This commit is contained in:
Anthony Minessale 2017-04-20 16:41:53 -05:00
parent 1db53ced7e
commit 87db085295

View File

@ -1846,7 +1846,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;
}