From: Brian West <brian@freeswitch.org>
Date: Wed, 17 Aug 2016 17:52:40 +0000 (-0500)
Subject: FS-9425 fix copy and paste error where we were not setting the height properly.
X-Git-Tag: v1.6.10~1^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c92bad18e020e22a2dd29c8a129bb3ca7656b21;p=thirdparty%2Ffreeswitch.git

FS-9425 fix copy and paste error where we were not setting the height properly.
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 28624d2120..47f44ec6e5 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2761,10 +2761,10 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
 					}
 				}
 
-				if (scale_h264_canvas_width < 320 || scale_h264_canvas_width < 180) {
+				if (scale_h264_canvas_width < 320 || scale_h264_canvas_height < 180) {
 					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid scale-h264-canvas-size, falling back to 320x180\n");
 					scale_h264_canvas_width = 320;
-					scale_h264_canvas_width = 180;
+					scale_h264_canvas_height = 180;
 				}
 			} else if (!strcasecmp(var, "scale-h264-canvas-fps-divisor") && !zstr(val)) {
 				scale_h264_canvas_fps_divisor = atoi(val);