正在显示
57 个修改的文件
包含
61 行增加
和
61 行删除
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | ''' | 2 | ''' |
| 3 | The MIT License (MIT) | 3 | The MIT License (MIT) |
| 4 | 4 | ||
| 5 | -Copyright (c) 2013 winlin | 5 | +Copyright (c) 2013-2014 winlin |
| 6 | 6 | ||
| 7 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 7 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 8 | this software and associated documentation files (the "Software"), to deal in | 8 | this software and associated documentation files (the "Software"), to deal in |
| @@ -463,7 +463,7 @@ if __name__ != "__main__": | @@ -463,7 +463,7 @@ if __name__ != "__main__": | ||
| 463 | 463 | ||
| 464 | # check the user options | 464 | # check the user options |
| 465 | if len(sys.argv) <= 1: | 465 | if len(sys.argv) <= 1: |
| 466 | - print "SRS api callback server, Copyright (c) 2013 winlin" | 466 | + print "SRS api callback server, Copyright (c) 2013-2014 winlin" |
| 467 | print "Usage: python %s <port>"%(sys.argv[0]) | 467 | print "Usage: python %s <port>"%(sys.argv[0]) |
| 468 | print " port: the port to listen at." | 468 | print " port: the port to listen at." |
| 469 | print "For example:" | 469 | print "For example:" |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| @@ -78,7 +78,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -78,7 +78,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 78 | #define RTMP_SIG_SRS_WEB "http://blog.csdn.net/win_lin" | 78 | #define RTMP_SIG_SRS_WEB "http://blog.csdn.net/win_lin" |
| 79 | #define RTMP_SIG_SRS_EMAIL "winterserver@126.com" | 79 | #define RTMP_SIG_SRS_EMAIL "winterserver@126.com" |
| 80 | #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" | 80 | #define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)" |
| 81 | -#define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013 winlin" | 81 | +#define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2014 winlin" |
| 82 | #define RTMP_SIG_SRS_CONTRIBUTOR "winlin,wenjiegit" | 82 | #define RTMP_SIG_SRS_CONTRIBUTOR "winlin,wenjiegit" |
| 83 | 83 | ||
| 84 | // compare | 84 | // compare |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
trunk/src/core/srs_core_bandwidth.cpp
100755 → 100644
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 wenjiegit | 4 | +Copyright (c) 2013-2014 wenjiegit |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 wenjiegit | 4 | +Copyright (c) 2013-2014 wenjiegit |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| @@ -736,7 +736,7 @@ int SrsConfig::parse_argv(int& i, char** argv) | @@ -736,7 +736,7 @@ int SrsConfig::parse_argv(int& i, char** argv) | ||
| 736 | void SrsConfig::print_help(char** argv) | 736 | void SrsConfig::print_help(char** argv) |
| 737 | { | 737 | { |
| 738 | printf(RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION | 738 | printf(RTMP_SIG_SRS_NAME" "RTMP_SIG_SRS_VERSION |
| 739 | - " Copyright (c) 2013 winlin\n" | 739 | + " Copyright (c) 2013-2014 winlin\n" |
| 740 | "Contributors: "RTMP_SIG_SRS_CONTRIBUTOR"\n" | 740 | "Contributors: "RTMP_SIG_SRS_CONTRIBUTOR"\n" |
| 741 | "Build: "SRS_BUILD_DATE" Configuration: "SRS_CONFIGURE"\n" | 741 | "Build: "SRS_BUILD_DATE" Configuration: "SRS_CONFIGURE"\n" |
| 742 | "Usage: %s [-h?vV] [-c <filename>]\n" | 742 | "Usage: %s [-h?vV] [-c <filename>]\n" |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
trunk/src/core/srs_core_protocol.cpp
100755 → 100644
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
trunk/src/core/srs_core_rtmp.hpp
100755 → 100644
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
trunk/src/main/srs_main_bandcheck.cpp
100755 → 100644
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 wenjiegit | 4 | +Copyright (c) 2013-2014 wenjiegit |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
| @@ -777,7 +777,7 @@ void print_version() | @@ -777,7 +777,7 @@ void print_version() | ||
| 777 | { | 777 | { |
| 778 | const char *version = "" | 778 | const char *version = "" |
| 779 | "srs_bandcheck "BUILD_VERSION"\n" | 779 | "srs_bandcheck "BUILD_VERSION"\n" |
| 780 | - "Copyright (C) 2013 wenjiegit.\n" | 780 | + "Copyright (c) 2013-2014 wenjiegit.\n" |
| 781 | "License MIT\n" | 781 | "License MIT\n" |
| 782 | "This is free software: you are free to change and redistribute it.\n" | 782 | "This is free software: you are free to change and redistribute it.\n" |
| 783 | "There is NO WARRANTY, to the extent permitted by law.\n" | 783 | "There is NO WARRANTY, to the extent permitted by law.\n" |
| 1 | /* | 1 | /* |
| 2 | The MIT License (MIT) | 2 | The MIT License (MIT) |
| 3 | 3 | ||
| 4 | -Copyright (c) 2013 winlin | 4 | +Copyright (c) 2013-2014 winlin |
| 5 | 5 | ||
| 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 6 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
| 7 | this software and associated documentation files (the "Software"), to deal in | 7 | this software and associated documentation files (the "Software"), to deal in |
-
请 注册 或 登录 后发表评论