]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10340: [mod_conference] Zoom layers not working right when input image is same...
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 24 May 2017 19:18:51 +0000 (14:18 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 24 May 2017 19:18:56 +0000 (14:18 -0500)
src/mod/applications/mod_conference/conference_video.c

index c31fd89b650d9dd7b5da8c93c530952bc6ef876f..128cba5055ce42a56150870f3a05ad0401b111ea 100644 (file)
@@ -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);