#IQRV #comment 处理合并报错问题

Module/mod_chromium/mod_chromium.cpp

@@ -14,7 +14,7 @@
 #include "baseEx.h"
 #include "CWebsocketServer.h"
 #include "mod_chromium.h"
-#include "base64.h"
+#include  "base64.h"
 #include "CModTools.h"
 #include "cJSON.h"
 #include "SpIni.h"
@@ -40,9 +40,6 @@
 #define COMPKEY_STATUS ((UINT_PTR) 1)
 #define COMPKEY_JOBOBJECT ((UINT_PTR) 2)
 
-
-
-
 void DbgByCefControl(const char * strMethod, const char* buf)
 {
 #if defined(_MSC_VER)

Module/mod_sipphone/mod_sipphone.h

@@ -361,11 +361,6 @@ private:
 	//eVideoRenderType GetMediaConfig();
 	ErrorCodeEnum LoadEntityConfig();
 	ErrorCodeEnum ConnectAssistChannel();
-	void HideLocalVideo();
-	void ShowLocalVideo();
-	void HideBothVideo();
-	void ShowBothVideo();
-	ErrorCodeEnum AudioDspFlagsUseCentersetting(endpoint_conf_t* conf);
 	bool IsPostAudioConfigInfo();
 
 public: