From 7150cede347fcbd4f8eb6283e6e10719dc9e9907 Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 28 Jun 2016 10:59:24 -0500 Subject: [PATCH] FS-9303 add CONF_VIDEO_MODE_NONE so we don't default to CONF_VIDEO_MODE_PASSTHROUGH --- src/mod/applications/mod_conference/mod_conference.c | 2 +- src/mod/applications/mod_conference/mod_conference.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 36bd064536..9b61946f95 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_PASSTHROUGH; + conference_video_mode_t conference_video_mode = CONF_VIDEO_MODE_NONE; 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 43fbec8c09..b024d68d17 100644 --- a/src/mod/applications/mod_conference/mod_conference.h +++ b/src/mod/applications/mod_conference/mod_conference.h @@ -522,7 +522,8 @@ typedef struct conference_record { typedef enum { CONF_VIDEO_MODE_PASSTHROUGH, CONF_VIDEO_MODE_TRANSCODE, - CONF_VIDEO_MODE_MUX + CONF_VIDEO_MODE_MUX, + CONF_VIDEO_MODE_NONE } conference_video_mode_t; /* Conference Object */