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

This commit is contained in:
Brian West 2016-06-28 10:59:24 -05:00
parent c9abf4570d
commit 7150cede34
2 changed files with 3 additions and 2 deletions

View File

@ -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;

View File

@ -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 */