From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 24 May 2017 19:18:51 +0000 (-0500)
Subject: FS-10340: [mod_conference] Zoom layers not working right when input image is same... 
X-Git-Tag: v1.8.0~493
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac6092e6dbfc6d87ee67c0da7adc6a89ad1ebe12;p=thirdparty%2Ffreeswitch.git

FS-10340: [mod_conference] Zoom layers not working right when input image is same height as the layer #resolve
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index c31fd89b65..128cba5055 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -641,8 +641,8 @@ void conference_video_scale_and_patch(mcu_layer_t *layer, switch_image_t *ximg,
 			}
 
 			if (scale == 1) {
-				crop_w = img->d_w;
-				crop_h = img->d_h;
+				crop_w = layer->screen_w;
+				crop_h = layer->screen_h;
 			} else {
 				crop_w = (uint32_t)((double)layer->screen_w / scale);
 				crop_h = (uint32_t)((double)layer->screen_h / scale);