Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev

src/Rtsp/RtpReceiver.cpp

@@ -63,7 +63,7 @@ bool RtpReceiver::handleOneRtp(int index, TrackType type, int sample_rate, uint8
         //ssrc错误
         //ssrc错误
         if (_ssrc_alive[index].elapsedTime() < 10 * 1000) {
         if (_ssrc_alive[index].elapsedTime() < 10 * 1000) {
             //接受正确ssrc的rtp在10秒内，那么我们认为存在多路rtp,忽略掉ssrc不匹配的rtp
             //接受正确ssrc的rtp在10秒内，那么我们认为存在多路rtp,忽略掉ssrc不匹配的rtp
-            WarnL << "ssrc比匹配,rtp已丢弃:" << ssrc << " != " << _ssrc[index];
+            WarnL << "ssrc不匹配,rtp已丢弃:" << ssrc << " != " << _ssrc[index];
             return false;
             return false;
         }
         }
         InfoL << "rtp流ssrc切换:" << _ssrc[index] << " -> " << ssrc;
         InfoL << "rtp流ssrc切换:" << _ssrc[index] << " -> " << ssrc;