正在显示
3 个修改的文件
包含
19 行增加
和
14 行删除
| @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 31 | // current release version | 31 | // current release version |
| 32 | #define VERSION_MAJOR 2 | 32 | #define VERSION_MAJOR 2 |
| 33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
| 34 | -#define VERSION_REVISION 42 | 34 | +#define VERSION_REVISION 43 |
| 35 | // server info. | 35 | // server info. |
| 36 | #define RTMP_SIG_SRS_KEY "SRS" | 36 | #define RTMP_SIG_SRS_KEY "SRS" |
| 37 | #define RTMP_SIG_SRS_ROLE "origin/edge server" | 37 | #define RTMP_SIG_SRS_ROLE "origin/edge server" |
| @@ -55,11 +55,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -55,11 +55,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 55 | 55 | ||
| 56 | // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 | 56 | // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 |
| 57 | #ifndef _WIN32 | 57 | #ifndef _WIN32 |
| 58 | -#include <unistd.h> | ||
| 59 | -#include <sys/socket.h> | ||
| 60 | -#include <netinet/in.h> | ||
| 61 | -#include <arpa/inet.h> | ||
| 62 | -#include <sys/uio.h> | 58 | + #include <unistd.h> |
| 59 | + #include <sys/socket.h> | ||
| 60 | + #include <netinet/in.h> | ||
| 61 | + #include <arpa/inet.h> | ||
| 62 | + #include <sys/uio.h> | ||
| 63 | #endif | 63 | #endif |
| 64 | 64 | ||
| 65 | #include <sys/types.h> | 65 | #include <sys/types.h> |
| @@ -28,6 +28,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -28,6 +28,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 28 | #include <srs_librtmp.h> | 28 | #include <srs_librtmp.h> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | +/** | ||
| 32 | +* srs-librtmp is a librtmp like library, | ||
| 33 | +* used to play/publish rtmp stream from/to rtmp server. | ||
| 34 | +* socket: use sync and block socket to connect/recv/send data with server. | ||
| 35 | +* depends: no need other libraries; depends on ssl if use srs_complex_handshake. | ||
| 36 | +* thread-safe: no | ||
| 37 | +*/ | ||
| 38 | + | ||
| 39 | +/************************************************************* | ||
| 40 | +************************************************************** | ||
| 41 | +* Windows SRS-LIBRTMP pre-declare | ||
| 42 | +************************************************************** | ||
| 43 | +*************************************************************/ | ||
| 31 | // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 | 44 | // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213 |
| 32 | #ifdef _WIN32 | 45 | #ifdef _WIN32 |
| 33 | // include windows first. | 46 | // include windows first. |
| @@ -50,14 +63,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -50,14 +63,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 50 | 63 | ||
| 51 | #include <sys/types.h> | 64 | #include <sys/types.h> |
| 52 | 65 | ||
| 53 | -/** | ||
| 54 | -* srs-librtmp is a librtmp like library, | ||
| 55 | -* used to play/publish rtmp stream from/to rtmp server. | ||
| 56 | -* socket: use sync and block socket to connect/recv/send data with server. | ||
| 57 | -* depends: no need other libraries; depends on ssl if use srs_complex_handshake. | ||
| 58 | -* thread-safe: no | ||
| 59 | -*/ | ||
| 60 | - | ||
| 61 | #ifdef __cplusplus | 66 | #ifdef __cplusplus |
| 62 | extern "C"{ | 67 | extern "C"{ |
| 63 | #endif | 68 | #endif |
-
请 注册 或 登录 后发表评论