Merge remote-tracking branch 'upstream/feature/rtc' into rtc

5 years ago · 55f264b704
parent ca7060c005 99614ac585
commit 55f264b704
1 changed files with 1 additions and 1 deletions
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@ -3876,7 +3876,7 @@ srs_error_t SrsConfig::check_normal_config()
            } else if (n == "rtc") {
                for (int j = 0; j < (int)conf->directives.size(); j++) {
                    string m = conf->at(j)->name;
-                    if (m != "enabled" && m != "bframe" && m != "aac") {
+                    if (m != "enabled" && m != "bframe" && m != "aac" && m != "stun_timeout") {
                        return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal vhost.rtc.%s of %s", m.c_str(), vhost->arg0().c_str());
                    }
                }