正在显示
2 个修改的文件
包含
1 行增加
和
2 行删除
@@ -1354,6 +1354,7 @@ int SrsConfig::check_config() | @@ -1354,6 +1354,7 @@ int SrsConfig::check_config() | ||
1354 | && e != "vthreads" && e != "vprofile" && e != "vpreset" && e != "vparams" | 1354 | && e != "vthreads" && e != "vprofile" && e != "vpreset" && e != "vparams" |
1355 | && e != "acodec" && e != "abitrate" && e != "asample_rate" && e != "achannels" | 1355 | && e != "acodec" && e != "abitrate" && e != "asample_rate" && e != "achannels" |
1356 | && e != "aparams" && e != "output" | 1356 | && e != "aparams" && e != "output" |
1357 | + && e != "iformat" && e != "oformat" | ||
1357 | ) { | 1358 | ) { |
1358 | ret = ERROR_SYSTEM_CONFIG_INVALID; | 1359 | ret = ERROR_SYSTEM_CONFIG_INVALID; |
1359 | srs_error("unsupported vhost transcode engine directive %s, ret=%d", e.c_str(), ret); | 1360 | srs_error("unsupported vhost transcode engine directive %s, ret=%d", e.c_str(), ret); |
@@ -56,8 +56,6 @@ void __srs_bytes_print(char* pa, int size); | @@ -56,8 +56,6 @@ void __srs_bytes_print(char* pa, int size); | ||
56 | 56 | ||
57 | class MockEmptyLog : public SrsFastLog | 57 | class MockEmptyLog : public SrsFastLog |
58 | { | 58 | { |
59 | -private: | ||
60 | - int _level; | ||
61 | public: | 59 | public: |
62 | MockEmptyLog(int level); | 60 | MockEmptyLog(int level); |
63 | virtual ~MockEmptyLog(); | 61 | virtual ~MockEmptyLog(); |
-
请 注册 或 登录 后发表评论