Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test

src/Common/MediaSource.cpp

@@ -35,6 +35,7 @@ string getOriginTypeString(MediaOriginType type){
         SWITCH_CASE(ffmpeg_pull);
         SWITCH_CASE(mp4_vod);
         SWITCH_CASE(device_chn);
+        SWITCH_CASE(rtc_push);
         default : return "unknown";
     }
 }

src/Common/MediaSource.h

@@ -45,7 +45,8 @@ enum class MediaOriginType : uint8_t {
     pull,
     ffmpeg_pull,
     mp4_vod,
-    device_chn
+    device_chn,
+    rtc_push,
 };
 
 string getOriginTypeString(MediaOriginType type);