From: Brian West <brian@freeswitch.org>
Date: Tue, 28 Jun 2016 16:04:24 +0000 (-0500)
Subject: Revert "FS-9303 add CONF_VIDEO_MODE_NONE so we don't default to CONF_VIDEO_MODE_PASST... 
X-Git-Tag: v1.6.10~1^2~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9508370de85b98cc6783f477f0452732db55468a;p=thirdparty%2Ffreeswitch.git

Revert "FS-9303 add CONF_VIDEO_MODE_NONE so we don't default to CONF_VIDEO_MODE_PASSTHROUGH"

This reverts commit 7150cede347fcbd4f8eb6283e6e10719dc9e9907.
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 9b61946f95..36bd064536 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2401,7 +2401,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
 	char *video_letterbox_bgcolor = NULL;
 	char *video_codec_bandwidth = NULL;
 	char *no_video_avatar = NULL;
-	conference_video_mode_t conference_video_mode = CONF_VIDEO_MODE_NONE;
+	conference_video_mode_t conference_video_mode = CONF_VIDEO_MODE_PASSTHROUGH;
 	int conference_video_quality = 1;
 	int auto_kps_debounce = 30000;
 	float fps = 30.0f;
diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index b024d68d17..43fbec8c09 100644
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -522,8 +522,7 @@ typedef struct conference_record {
 typedef enum {
 	CONF_VIDEO_MODE_PASSTHROUGH,
 	CONF_VIDEO_MODE_TRANSCODE,
-	CONF_VIDEO_MODE_MUX,
-	CONF_VIDEO_MODE_NONE
+	CONF_VIDEO_MODE_MUX
 } conference_video_mode_t;
 
 /* Conference Object */