external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

fix the utest mock config bug

Browse source
This commit is contained in:
winlin 2014-07-26 15:03:07 +08:00
parent 9f2da4e095
commit 5f7ff37e64
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_config.cpp
View file

@ -1354,6 +1354,7 @@ int SrsConfig::check_config()
&& e != "vthreads" && e != "vprofile" && e != "vpreset" && e != "vparams" && e != "vthreads" && e != "vprofile" && e != "vpreset" && e != "vparams"
&& e != "acodec" && e != "abitrate" && e != "asample_rate" && e != "achannels" && e != "acodec" && e != "abitrate" && e != "asample_rate" && e != "achannels"
&& e != "aparams" && e != "output" && e != "aparams" && e != "output"
&& e != "iformat" && e != "oformat"
) { ) {
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("unsupported vhost transcode engine directive %s, ret=%d", e.c_str(), ret); srs_error("unsupported vhost transcode engine directive %s, ret=%d", e.c_str(), ret);

2
trunk/src/utest/srs_utest.hpp
View file

@ -56,8 +56,6 @@ void __srs_bytes_print(char* pa, int size);
class MockEmptyLog : public SrsFastLog class MockEmptyLog : public SrsFastLog
{ {
private:
int _level;
public: public:
MockEmptyLog(int level); MockEmptyLog(int level);
virtual ~MockEmptyLog(); virtual ~MockEmptyLog();