Merge branch '4.0release' into merge/develop

2025-02-15 04:42:04 +00:00 · 2021-04-20 19:02:17 +08:00 · 2021-04-20 19:02:17 +08:00 · 56446825dc
commit 56446825dc
parent 49dffcd5d0 cec0191b16
38 changed files with 38 additions and 38 deletions
--- a/trunk/src/app/srs_app_gb28181.cpp
+++ b/trunk/src/app/srs_app_gb28181.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_gb28181.hpp
+++ b/trunk/src/app/srs_app_gb28181.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_gb28181_sip.cpp
+++ b/trunk/src/app/srs_app_gb28181_sip.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_gb28181_sip.hpp
+++ b/trunk/src/app/srs_app_gb28181_sip.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_codec.cpp
+++ b/trunk/src/app/srs_app_rtc_codec.cpp
@ -2,7 +2,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Bepartofyou
+ * Copyright (c) 2013-2021 Bepartofyou
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_codec.hpp
+++ b/trunk/src/app/srs_app_rtc_codec.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Bepartofyou
+ * Copyright (c) 2013-2021 Bepartofyou
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_conn.cpp
+++ b/trunk/src/app/srs_app_rtc_conn.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_conn.hpp
+++ b/trunk/src/app/srs_app_rtc_conn.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_jitbuffer.cpp
+++ b/trunk/src/app/srs_app_rtc_jitbuffer.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_jitbuffer.hpp
+++ b/trunk/src/app/srs_app_rtc_jitbuffer.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_queue.cpp
+++ b/trunk/src/app/srs_app_rtc_queue.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_queue.hpp
+++ b/trunk/src/app/srs_app_rtc_queue.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_sdp.cpp
+++ b/trunk/src/app/srs_app_rtc_sdp.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_sdp.hpp
+++ b/trunk/src/app/srs_app_rtc_sdp.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_server.cpp
+++ b/trunk/src/app/srs_app_rtc_server.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_server.hpp
+++ b/trunk/src/app/srs_app_rtc_server.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_source.cpp
+++ b/trunk/src/app/srs_app_rtc_source.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_rtc_source.hpp
+++ b/trunk/src/app/srs_app_rtc_source.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_sip.cpp
+++ b/trunk/src/app/srs_app_sip.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/app/srs_app_sip.hpp
+++ b/trunk/src/app/srs_app_sip.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Lixin
+ * Copyright (c) 2013-2021 Lixin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp
+++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 LiPeng
+ * Copyright (c) 2013-2021 LiPeng
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp
+++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 LiPeng
+ * Copyright (c) 2013-2021 LiPeng
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtc_stun_stack.cpp
+++ b/trunk/src/protocol/srs_rtc_stun_stack.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtc_stun_stack.hpp
+++ b/trunk/src/protocol/srs_rtc_stun_stack.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 John
+ * Copyright (c) 2013-2021 John
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_conn.cpp
+++ b/trunk/src/srt/srt_conn.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_conn.hpp
+++ b/trunk/src/srt/srt_conn.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_data.cpp
+++ b/trunk/src/srt/srt_data.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_data.hpp
+++ b/trunk/src/srt/srt_data.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_handle.cpp
+++ b/trunk/src/srt/srt_handle.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_handle.hpp
+++ b/trunk/src/srt/srt_handle.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_server.cpp
+++ b/trunk/src/srt/srt_server.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_server.hpp
+++ b/trunk/src/srt/srt_server.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_to_rtmp.cpp
+++ b/trunk/src/srt/srt_to_rtmp.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/srt_to_rtmp.hpp
+++ b/trunk/src/srt/srt_to_rtmp.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/stringex.hpp
+++ b/trunk/src/srt/stringex.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/ts_demux.cpp
+++ b/trunk/src/srt/ts_demux.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/ts_demux.hpp
+++ b/trunk/src/srt/ts_demux.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/srt/ts_demux_test.cpp
+++ b/trunk/src/srt/ts_demux_test.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Runner365
+ * Copyright (c) 2013-2021 Runner365
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in