From d44e4d1c65574d852ff7490bc6041ce466461e11 Mon Sep 17 00:00:00 2001 From: hubin <hubin@3mang.com> Date: Mon, 30 Nov 2020 15:16:36 +0800 Subject: [PATCH] 版本 1.1.0 1.去除推流等功能，仅保留手写板支持 2.wss server由TLS 1.0 改为TLS 1.2 source git: http://123.56.226.173/hubin/liveAssistant.git branch: liveserv commit 3972fa63f0c3f38a9d74cb7bb4c15f4cd52fe0fa --- doc/readme.txt | 3 +++ files/AdvVideoDev.dll | Bin 403968 -> 0 bytes files/EngineCfg.ini | 47 ----------------------------------------------- files/FlvPlayer.exe | Bin 162304 -> 0 bytes files/IntelDec.dll | Bin 106496 -> 0 bytes files/IntelEnc.dll | Bin 112128 -> 0 bytes files/IntelUtil.dll | Bin 95232 -> 0 bytes files/MediaEngine.dll | Bin 308736 -> 0 bytes files/QQAudioHook.dll | Bin 123904 -> 0 bytes files/QQAudioHookService.dll | Bin 99328 -> 0 bytes files/SmartLog.dll | Bin 36864 -> 0 bytes files/SmartPublisherSDK.dll | Bin 897024 -> 0 bytes files/TRAE.dll | Bin 1482240 -> 0 bytes files/TcHevcDec.dll | Bin 233016 -> 0 bytes files/TcHevcEnc.dll | Bin 532024 -> 0 bytes files/TcVpxDec.dll | Bin 292864 -> 0 bytes files/TcVpxEnc.dll | Bin 665088 -> 0 bytes files/UdtCfg.ini | 18 ------------------ files/VP8.dll | Bin 476160 -> 0 bytes files/WSSClient.exe | Bin 548864 -> 0 bytes files/agora_rtc_sdk.dll | Bin 15435280 -> 0 bytes files/agora_sig_sdk.dll | Bin 1181200 -> 0 bytes files/audio_reg.bat | 1 - files/audio_reg64.bat | 1 - files/audio_sniffer-x64.dll | Bin 55808 -> 0 bytes files/audio_sniffer.dll | Bin 49152 -> 0 bytes files/audio_unreg.bat | 1 - files/audio_unreg64.bat | 1 - files/avcodec-56.dll | Bin 22515200 -> 0 bytes files/avdevice-56.dll | Bin 1382912 -> 0 bytes files/avfilter-5.dll | Bin 2478592 -> 0 bytes files/avformat-56.dll | Bin 6072832 -> 0 bytes files/avutil-54.dll | Bin 496640 -> 0 bytes files/lame_enc.dll | Bin 199680 -> 0 bytes files/libcrypto.dll | Bin 1723196 -> 0 bytes files/libmov.dll | Bin 140288 -> 0 bytes files/libqav.dll | Bin 64000 -> 0 bytes files/libtim.dll | Bin 7571968 -> 0 bytes files/libws.dll | Bin 542208 -> 0 bytes files/libx264-104.dll | Bin 785408 -> 0 bytes files/livemgr.exe | Bin 25088 -> 0 bytes files/livestream.dll | Bin 177152 -> 0 bytes files/log.dll | Bin 21504 -> 0 bytes files/mfc120u.dll | Bin 4449952 -> 0 bytes files/postproc-53.dll | Bin 131072 -> 0 bytes files/pthreadGC2.dll | Bin 89273 -> 0 bytes files/qavsdk.dll | Bin 1266176 -> 0 bytes files/server.key | 50 +++++++++++++++++++++++++------------------------- files/server.pem | 47 ++++++++++++++++++++++++----------------------- files/swresample-1.dll | Bin 282112 -> 0 bytes files/swscale-3.dll | Bin 491008 -> 0 bytes files/tinyxml.dll | Bin 93752 -> 0 bytes files/wsclient.exe | Bin 491008 -> 0 bytes files/xPlatform.dll | Bin 231424 -> 0 bytes files/xuedianyun.exe | Bin 261632 -> 0 bytes files/xuedianyun.ini | 3 --- 56 files changed, 52 insertions(+), 120 deletions(-) delete mode 100644 files/AdvVideoDev.dll delete mode 100644 files/EngineCfg.ini delete mode 100644 files/FlvPlayer.exe delete mode 100644 files/IntelDec.dll delete mode 100644 files/IntelEnc.dll delete mode 100644 files/IntelUtil.dll delete mode 100644 files/MediaEngine.dll delete mode 100644 files/QQAudioHook.dll delete mode 100644 files/QQAudioHookService.dll delete mode 100644 files/SmartLog.dll delete mode 100644 files/SmartPublisherSDK.dll delete mode 100644 files/TRAE.dll delete mode 100644 files/TcHevcDec.dll delete mode 100644 files/TcHevcEnc.dll delete mode 100644 files/TcVpxDec.dll delete mode 100644 files/TcVpxEnc.dll delete mode 100644 files/UdtCfg.ini delete mode 100644 files/VP8.dll delete mode 100644 files/WSSClient.exe delete mode 100644 files/agora_rtc_sdk.dll delete mode 100644 files/agora_sig_sdk.dll delete mode 100644 files/audio_reg.bat delete mode 100644 files/audio_reg64.bat delete mode 100644 files/audio_sniffer-x64.dll delete mode 100644 files/audio_sniffer.dll delete mode 100644 files/audio_unreg.bat delete mode 100644 files/audio_unreg64.bat delete mode 100644 files/avcodec-56.dll delete mode 100644 files/avdevice-56.dll delete mode 100644 files/avfilter-5.dll delete mode 100644 files/avformat-56.dll delete mode 100644 files/avutil-54.dll delete mode 100644 files/lame_enc.dll delete mode 100644 files/libcrypto.dll delete mode 100644 files/libmov.dll delete mode 100644 files/libqav.dll delete mode 100644 files/libtim.dll delete mode 100644 files/libx264-104.dll delete mode 100644 files/livestream.dll delete mode 100644 files/mfc120u.dll delete mode 100644 files/postproc-53.dll delete mode 100644 files/pthreadGC2.dll delete mode 100644 files/qavsdk.dll delete mode 100644 files/swresample-1.dll delete mode 100644 files/swscale-3.dll delete mode 100644 files/tinyxml.dll delete mode 100644 files/wsclient.exe delete mode 100644 files/xPlatform.dll delete mode 100644 files/xuedianyun.ini diff --git a/doc/readme.txt b/doc/readme.txt index e0af149..ef4d19a 100644 --- a/doc/readme.txt +++ b/doc/readme.txt @@ -51,3 +51,6 @@ �汾 1.0.10 1.֧��PendoTech PH-1820-A USB��д�� +�汾 1.1.0 +1.ȥ�������ȹ��ܣ���������д��֧�� +2.wss server��TLS 1.0 ��ΪTLS 1.2 \ No newline at end of file diff --git a/files/AdvVideoDev.dll b/files/AdvVideoDev.dll deleted file mode 100644 index aea53b8..0000000 Binary files a/files/AdvVideoDev.dll and /dev/null differ diff --git a/files/EngineCfg.ini b/files/EngineCfg.ini deleted file mode 100644 index 164269f..0000000 --- a/files/EngineCfg.ini +++ /dev/null @@ -1,47 +0,0 @@ -[Encode] -codetype=6 -width = 480 -height= 360 -fps= 12 -bt=800 -goptype=1 -minqp=25 -maxqp=25 - -imtu=1000 -spmtu=1000 -pmtu=1000 -ifec=0 -spfec=0 -pfec=0 -ifecmpkg=4 -spfecmpkg=3 -pfecmpkg=2 -ifecmpkgsize=600 -spfecmpkgsize=500 -pfecmpkgsize=500 -gop=50 -encmode=0 - -QClearswh = 1 -QCleargrade = 0 -Fecswh = 1 - -[Audio] -CodecType = 4103 -SampleRate = 48000 -ChnNum = 2 -Bitrate = 64000 -Lost = 0 -RECN = 6 -RECM = 0 -AudioMTU = 0 -PackDuration = 60 -rate_type = 0 -DTX_enable = 0 -VAD_enable = 0 -aec_enable = 0 -ns_enable = 0 -agc_enable = 0 -lostfb_enable = 0 -FecFlag = 0 diff --git a/files/FlvPlayer.exe b/files/FlvPlayer.exe deleted file mode 100644 index b23c83e..0000000 Binary files a/files/FlvPlayer.exe and /dev/null differ diff --git a/files/IntelDec.dll b/files/IntelDec.dll deleted file mode 100644 index 65574f8..0000000 Binary files a/files/IntelDec.dll and /dev/null differ diff --git a/files/IntelEnc.dll b/files/IntelEnc.dll deleted file mode 100644 index d9feb61..0000000 Binary files a/files/IntelEnc.dll and /dev/null differ diff --git a/files/IntelUtil.dll b/files/IntelUtil.dll deleted file mode 100644 index 365f32e..0000000 Binary files a/files/IntelUtil.dll and /dev/null differ diff --git a/files/MediaEngine.dll b/files/MediaEngine.dll deleted file mode 100644 index 92e0539..0000000 Binary files a/files/MediaEngine.dll and /dev/null differ diff --git a/files/QQAudioHook.dll b/files/QQAudioHook.dll deleted file mode 100644 index e4d1452..0000000 Binary files a/files/QQAudioHook.dll and /dev/null differ diff --git a/files/QQAudioHookService.dll b/files/QQAudioHookService.dll deleted file mode 100644 index aa0bc17..0000000 Binary files a/files/QQAudioHookService.dll and /dev/null differ diff --git a/files/SmartLog.dll b/files/SmartLog.dll deleted file mode 100644 index aa3c352..0000000 Binary files a/files/SmartLog.dll and /dev/null differ diff --git a/files/SmartPublisherSDK.dll b/files/SmartPublisherSDK.dll deleted file mode 100644 index dd8a4cd..0000000 Binary files a/files/SmartPublisherSDK.dll and /dev/null differ diff --git a/files/TRAE.dll b/files/TRAE.dll deleted file mode 100644 index 8659667..0000000 Binary files a/files/TRAE.dll and /dev/null differ diff --git a/files/TcHevcDec.dll b/files/TcHevcDec.dll deleted file mode 100644 index 7ef4201..0000000 Binary files a/files/TcHevcDec.dll and /dev/null differ diff --git a/files/TcHevcEnc.dll b/files/TcHevcEnc.dll deleted file mode 100644 index 9a3c074..0000000 Binary files a/files/TcHevcEnc.dll and /dev/null differ diff --git a/files/TcVpxDec.dll b/files/TcVpxDec.dll deleted file mode 100644 index 6a1b526..0000000 Binary files a/files/TcVpxDec.dll and /dev/null differ diff --git a/files/TcVpxEnc.dll b/files/TcVpxEnc.dll deleted file mode 100644 index a4c3b55..0000000 Binary files a/files/TcVpxEnc.dll and /dev/null differ diff --git a/files/UdtCfg.ini b/files/UdtCfg.ini deleted file mode 100644 index b405ec4..0000000 --- a/files/UdtCfg.ini +++ /dev/null @@ -1,18 +0,0 @@ -[Udt] -FirstGetTime = 500 -GetPkgTimeout = 2500 -NextGetTime = 500 -RecvQueuePeriod = 2000 - -MaxResendCnt = 5 -SendQueuePeriod= 2000 -ResendMax = 2000 -ResendMin = 200 -RTTDelta = 150 -TimerResendCnt = 3 - -EnableUDT = 1 - -CalcSendLossTime = 2000 - -TimelineDelta = 1000 diff --git a/files/VP8.dll b/files/VP8.dll deleted file mode 100644 index a246466..0000000 Binary files a/files/VP8.dll and /dev/null differ diff --git a/files/WSSClient.exe b/files/WSSClient.exe deleted file mode 100644 index fc8a186..0000000 Binary files a/files/WSSClient.exe and /dev/null differ diff --git a/files/agora_rtc_sdk.dll b/files/agora_rtc_sdk.dll deleted file mode 100644 index d201b5c..0000000 Binary files a/files/agora_rtc_sdk.dll and /dev/null differ diff --git a/files/agora_sig_sdk.dll b/files/agora_sig_sdk.dll deleted file mode 100644 index 6c14aec..0000000 Binary files a/files/agora_sig_sdk.dll and /dev/null differ diff --git a/files/audio_reg.bat b/files/audio_reg.bat deleted file mode 100644 index 4d6e55b..0000000 --- a/files/audio_reg.bat +++ /dev/null @@ -1 +0,0 @@ -regsvr32 /s %~dp0\audio_sniffer.dll \ No newline at end of file diff --git a/files/audio_reg64.bat b/files/audio_reg64.bat deleted file mode 100644 index fd3e6ef..0000000 --- a/files/audio_reg64.bat +++ /dev/null @@ -1 +0,0 @@ -regsvr32 /s "%~dp0\audio_sniffer-x64.dll" \ No newline at end of file diff --git a/files/audio_sniffer-x64.dll b/files/audio_sniffer-x64.dll deleted file mode 100644 index dabdbb7..0000000 Binary files a/files/audio_sniffer-x64.dll and /dev/null differ diff --git a/files/audio_sniffer.dll b/files/audio_sniffer.dll deleted file mode 100644 index 4dc875f..0000000 Binary files a/files/audio_sniffer.dll and /dev/null differ diff --git a/files/audio_unreg.bat b/files/audio_unreg.bat deleted file mode 100644 index 9a341db..0000000 --- a/files/audio_unreg.bat +++ /dev/null @@ -1 +0,0 @@ -regsvr32 /u /s %~dp0\audio_sniffer.dll \ No newline at end of file diff --git a/files/audio_unreg64.bat b/files/audio_unreg64.bat deleted file mode 100644 index ec8134a..0000000 --- a/files/audio_unreg64.bat +++ /dev/null @@ -1 +0,0 @@ -regsvr32 /u /s "%~dp0\audio_sniffer-x64.dll" \ No newline at end of file diff --git a/files/avcodec-56.dll b/files/avcodec-56.dll deleted file mode 100644 index a3e3634..0000000 Binary files a/files/avcodec-56.dll and /dev/null differ diff --git a/files/avdevice-56.dll b/files/avdevice-56.dll deleted file mode 100644 index fe9e07e..0000000 Binary files a/files/avdevice-56.dll and /dev/null differ diff --git a/files/avfilter-5.dll b/files/avfilter-5.dll deleted file mode 100644 index d691b21..0000000 Binary files a/files/avfilter-5.dll and /dev/null differ diff --git a/files/avformat-56.dll b/files/avformat-56.dll deleted file mode 100644 index 40ffa39..0000000 Binary files a/files/avformat-56.dll and /dev/null differ diff --git a/files/avutil-54.dll b/files/avutil-54.dll deleted file mode 100644 index 6808b31..0000000 Binary files a/files/avutil-54.dll and /dev/null differ diff --git a/files/lame_enc.dll b/files/lame_enc.dll deleted file mode 100644 index 314514a..0000000 Binary files a/files/lame_enc.dll and /dev/null differ diff --git a/files/libcrypto.dll b/files/libcrypto.dll deleted file mode 100644 index 60ca78a..0000000 Binary files a/files/libcrypto.dll and /dev/null differ diff --git a/files/libmov.dll b/files/libmov.dll deleted file mode 100644 index 5847650..0000000 Binary files a/files/libmov.dll and /dev/null differ diff --git a/files/libqav.dll b/files/libqav.dll deleted file mode 100644 index 4806835..0000000 Binary files a/files/libqav.dll and /dev/null differ diff --git a/files/libtim.dll b/files/libtim.dll deleted file mode 100644 index bde9e08..0000000 Binary files a/files/libtim.dll and /dev/null differ diff --git a/files/libws.dll b/files/libws.dll index b2b8b9c..e7b408b 100644 Binary files a/files/libws.dll and b/files/libws.dll differ diff --git a/files/libx264-104.dll b/files/libx264-104.dll deleted file mode 100644 index 7626396..0000000 Binary files a/files/libx264-104.dll and /dev/null differ diff --git a/files/livemgr.exe b/files/livemgr.exe index 456748e..aa1fb3d 100644 Binary files a/files/livemgr.exe and b/files/livemgr.exe differ diff --git a/files/livestream.dll b/files/livestream.dll deleted file mode 100644 index c7e9a12..0000000 Binary files a/files/livestream.dll and /dev/null differ diff --git a/files/log.dll b/files/log.dll index c97cd4a..bc2a1d3 100644 Binary files a/files/log.dll and b/files/log.dll differ diff --git a/files/mfc120u.dll b/files/mfc120u.dll deleted file mode 100644 index 3e5c2be..0000000 Binary files a/files/mfc120u.dll and /dev/null differ diff --git a/files/postproc-53.dll b/files/postproc-53.dll deleted file mode 100644 index 91b92ae..0000000 Binary files a/files/postproc-53.dll and /dev/null differ diff --git a/files/pthreadGC2.dll b/files/pthreadGC2.dll deleted file mode 100644 index 89bc516..0000000 Binary files a/files/pthreadGC2.dll and /dev/null differ diff --git a/files/qavsdk.dll b/files/qavsdk.dll deleted file mode 100644 index 3829997..0000000 Binary files a/files/qavsdk.dll and /dev/null differ diff --git a/files/server.key b/files/server.key index 572a3cf..94d3b99 100644 --- a/files/server.key +++ b/files/server.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/files/server.pem b/files/server.pem index b31c1f4..6cf7646 100644 --- a/files/server.pem +++ b/files/server.pem @@ -1,17 +1,17 @@ -----BEGIN CERTIFICATE----- -MIIGCTCCBPGgAwIBAgIMU8HkTasUwK4PnEA8MA0GCSqGSIb3DQEBCwUAMFAxCzAJ +MIIGCTCCBPGgAwIBAgIMK8/QrkOsSdb3dzpJMA0GCSqGSIb3DQEBCwUAMFAxCzAJ BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSYwJAYDVQQDEx1H -bG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxODAeFw0xOTA4MjcwNjM1MjRaFw0y -MDEwMTIwOTUzMjhaMIGTMQswCQYDVQQGEwJDTjEPMA0GA1UECAwG5YyX5LqsMQ8w +bG9iYWxTaWduIFJTQSBPViBTU0wgQ0EgMjAxODAeFw0yMDA5MjkwNTQ1NTBaFw0y +MTEwMzEwMTE2MTFaMIGTMQswCQYDVQQGEwJDTjEPMA0GA1UECAwG5YyX5LqsMQ8w DQYDVQQHDAbljJfkuqwxEjAQBgNVBAsMCei/kOiQpemDqDEzMDEGA1UECgwq5LiJ 6IqS5LiW57qq77yI5YyX5Lqs77yJ56eR5oqA5pyJ6ZmQ5YWs5Y+4MRkwFwYDVQQD DBAqLnh1ZWRpYW55dW4uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEA0KggjzRE4yARurOmmyNPykVYnnT2jkfWQoGzN7uGZ8/ZT9nLqqkrU61dSqPg -ZpPvGhsUzjEnqWqQubXF2XhjyaTj0+hDzGOX9k4pZ37H96oWWyF2QYLe9GrcznVh -xZnx8foNnZExiCO6TOJgBVGLTFhtwgPF57e/sL6IxsDvp58Mt1ePqB4Wsl3e/YnT -ZdaQV38QfEuTTSU0OC3hufUpGlb4DMX3N+gT1kWAtjq5frjX5KxEw407mSHkaT/I -KPZg5XKFPg7faQSrmq39bXygUL6UCh8ue4cJPG+A8bx7/Ov/+RzhYpOcuzNQeKVm -PX3mlUdHg72NsWLKK65AnRcQKQIDAQABo4ICnTCCApkwDgYDVR0PAQH/BAQDAgWg +AQEAtBKcWLvkqGebkrCE9zTDRvMRKsdtqnxv78vFCfe46xmxKMEJaLCSGTba610w +Yr3g1DSYjnxbUT8JCModwa4TADcUUc1q1NvWBHhrZ+7thbSGbxEwHqEJ0zrEJYqk +cZa3HaHeEeJeW8jx+bBmgyhQIfW3kp6atOw+P/B252Yqu0BWvAOpUDqLKDEWOsxX +AGpak+GsMB5b/Sb8VWUGQCKF225Vz6xpNBCD2+ZxzEh633UNQrMWl3ySNViIVQp8 +ljVNiXcOyvs5cQnPwLXAUya2qaQcyuWf3oQQ6Ygy8AWk4m+AQu37vjtonpLDh5EJ +JUChCC8BvOWnKMv6t7KeyEZhfQIDAQABo4ICnTCCApkwDgYDVR0PAQH/BAQDAgWg MIGOBggrBgEFBQcBAQSBgTB/MEQGCCsGAQUFBzAChjhodHRwOi8vc2VjdXJlLmds b2JhbHNpZ24uY29tL2NhY2VydC9nc3JzYW92c3NsY2EyMDE4LmNydDA3BggrBgEF BQcwAYYraHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3Nyc2FvdnNzbGNhMjAx @@ -19,19 +19,19 @@ ODBWBgNVHSAETzBNMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRwczov L3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAIBgZngQwBAgIwCQYDVR0T BAIwADArBgNVHREEJDAighAqLnh1ZWRpYW55dW4uY29tgg54dWVkaWFueXVuLmNv bTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAU+O9/ -8s14Z6jeb48kjYjxhwMCs+swHQYDVR0OBBYEFNtg3ep5/qID/d0SQuRH1PF8iQu0 -MIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYA7ku9t3XOYLrhQmkfq+GeZqMPfl+w -ctiDAMR7iXqo/csAAAFs0clO2AAABAMARzBFAiEAiGiqep0KK0p4s5VguosdGOOt -x9fOn1s9hqnkKm/YG14CIAnQMiQXHARNgaewJsh1HtAj9E6bX2ywnR8uH4ec3Zxp -AHcAh3W/51l8+IxDmV+9827/Vo1HVjb/SrVgwbTq/16ggw8AAAFs0clOmAAABAMA -SDBGAiEApE4WFltEvnNOUwuilBVRPH2dZE4eo2q4MDjUZ8+aGPgCIQCgL95ZKmpO -GNxP1yIWZkeT/kqO8bZijn9WSSF2tLYjnzANBgkqhkiG9w0BAQsFAAOCAQEAnjiW -NHRXqGgvNvPwroFVSCQMu/Feo95ks2GtW+n+/VoobujfoqoS/WnfD/R13qj8/L3Z -n6RaK49WkiaXFidK8ur7HnLbH4ZTzZVMKPBQ2u+CLsOHAuGm9Cvm5vmZwRjn5KLU -ifP4fUMd5KEpqyDqhUj4PIDiPx5hXdAIqyijUjDuMjkE6FqjyNzLedFLOnSN0yTh -GV3OLrKMpe9RRpnIt+yYe6/Ou8n/c6x8hcZM48HC126YmFKf4a0v0or8j+TiBiwP -NB8V7jxG2FpzKGkezRA5ewsGeNL0Pe92tmkaiXS5e2UKz7gvLQ8kSCpZisKRI3L3 -gpHutUClEZpAXPF/cQ== +8s14Z6jeb48kjYjxhwMCs+swHQYDVR0OBBYEFOdLdfWalzeQFRiPQLYRQ1+gVdgp +MIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkC +wQApBo2yCJo32RMAAAF02GVTAAAABAMARzBFAiEAgQWqUmlpvqEqNR7/ynMIQlMz +vRZ3cb85g2K7mCqiXBMCIDiOTFVpXndIfwCX+Tq1wc8K1wkG+A73Q806R3F14U5O +AHcA9lyUL9F3MCIUVBgIMJRWjuNNExkzv98MLyALzE7xZOMAAAF02GVVsgAABAMA +SDBGAiEAj23yNAVi8s/z/g0xbNw+fZ7uXBOQRjBQSfZiztBGKDMCIQCkCOPs53Hg +8rGd77I8Yc676gELflWrvDG/5mFjemhy8zANBgkqhkiG9w0BAQsFAAOCAQEAYS1q +ZbDMu28qua0p1dhRcbdaesjE2m75lq9Qq0etju8fE28wkrl04/kxdEXiOKlMFeI2 +bHrfbO8z48FFllDY96RdAxB9Mn50NBq8MPbzOVJITj25psY0r+mbgAJDWjw/qefH +5OuSSYTvmbRbA8YXelI8YiSToDfueXzGscnnEBXTK3SvSFCCcSbuhQpnt5a/PM1h +Y4EcNRaZisTaTCv62cfsHMXNuvmu50Wahp/Yt30vGVVkZIAsUG2WRb8rKxkLqlZ3 +IP1LreTW6oA1H53H7eiSyMq5AP4y6YlrnR6gpKm/FEidRkoH9wm7YkrG9jYCQazR +GiORQiNw+OzawZRVuA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIETjCCAzagAwIBAgINAe5fIh38YjvUMzqFVzANBgkqhkiG9w0BAQsFADBMMSAw @@ -56,5 +56,6 @@ EdSIhlIoU4r7rd/9c446ZwTbw1MUcBQJfMPg+NccmBqixD7b6QDjynCy8SIwIVbb 0615XoFYC20UgDX1b10d65pHBf9ZjQCxQNqQmJYaumxtf4z1s4DfjGRzNpZ5eWl0 6r/4ngGPoJVpjemEuunl1Ig423g7mNA2eymw0lIYkN5SQwCuaifIFJ6GlazhgDEw fpolu4usBCOmmQDo8dIm7A9+O4orkjgTHY+GzYZSR+Y0fFukAj6KYXwidlNalFMz -hriSqHKvoflShx8xpfywgVcvzfTO3PYkz6fiNJBonf6q8amaEsybwMbDqKWwIX7eSPY= +hriSqHKvoflShx8xpfywgVcvzfTO3PYkz6fiNJBonf6q8amaEsybwMbDqKWwIX7e +SPY= -----END CERTIFICATE----- diff --git a/files/swresample-1.dll b/files/swresample-1.dll deleted file mode 100644 index d9c368f..0000000 Binary files a/files/swresample-1.dll and /dev/null differ diff --git a/files/swscale-3.dll b/files/swscale-3.dll deleted file mode 100644 index 2db0bda..0000000 Binary files a/files/swscale-3.dll and /dev/null differ diff --git a/files/tinyxml.dll b/files/tinyxml.dll deleted file mode 100644 index 8a4e682..0000000 Binary files a/files/tinyxml.dll and /dev/null differ diff --git a/files/wsclient.exe b/files/wsclient.exe deleted file mode 100644 index 298640b..0000000 Binary files a/files/wsclient.exe and /dev/null differ diff --git a/files/xPlatform.dll b/files/xPlatform.dll deleted file mode 100644 index 027ac28..0000000 Binary files a/files/xPlatform.dll and /dev/null differ diff --git a/files/xuedianyun.exe b/files/xuedianyun.exe index 80f535d..3e138d4 100644 Binary files a/files/xuedianyun.exe and b/files/xuedianyun.exe differ diff --git a/files/xuedianyun.ini b/files/xuedianyun.ini deleted file mode 100644 index a0c8557..0000000 --- a/files/xuedianyun.ini +++ /dev/null @@ -1,3 +0,0 @@ -[RTMP] -port=1935 - -- libgit2 0.24.0