external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-04-20 19:02:17 +08:00
commit 56446825dc
38 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_gb28181.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_gb28181.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_gb28181_sip.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_gb28181_sip.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_codec.cpp
View file

@ -2,7 +2,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_codec.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_conn.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_jitbuffer.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_jitbuffer.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_queue.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_queue.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_sdp.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_sdp.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_server.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_server.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_source.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_rtc_source.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_sip.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_sip.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/kernel/srs_kernel_rtc_rtcp.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/kernel/srs_kernel_rtc_rtcp.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/protocol/srs_rtc_stun_stack.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/protocol/srs_rtc_stun_stack.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_conn.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_conn.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_data.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_data.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_handle.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_handle.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_server.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_server.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_to_rtmp.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/srt_to_rtmp.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/stringex.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/ts_demux.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/ts_demux.hpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in

2
trunk/src/srt/ts_demux_test.cpp
View file

@ -1,7 +1,7 @@
/** /**
* The MIT License (MIT) * 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 * 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 * this software and associated documentation files (the "Software"), to deal in