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

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 9b61946f950e05702038e49ae14d3ef3628459c4..36bd064536c6b02d925e33eefb300e78586cb42c 100644 (file)
--- 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 b024d68d17101165e1896bed4475eedaf5043c40..43fbec8c091c0df1bd7c4ee66604064e1be66bb6 100644 (file)
--- 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 */