mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-06-29 08:18:58 +02:00
Merge pull request #160 from sergey-dryabzhinsky/issue-158-fix-windows-build-with-1.11-nginx
Type conversions for MSVS
This commit is contained in:
commit
1d5a20ea2b
|
@ -1050,7 +1050,7 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is continuity counter for TS header
|
// This is continuity counter for TS header
|
||||||
mpegts_cc = (ctx->nfrags + ctx->frag);
|
mpegts_cc = (ngx_uint_t)(ctx->nfrags + ctx->frag);
|
||||||
|
|
||||||
ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||||
"hls: open fragment file='%s', keyfile='%s', "
|
"hls: open fragment file='%s', keyfile='%s', "
|
||||||
|
|
|
@ -454,7 +454,7 @@ ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
|
||||||
if (sl_next != 0) {
|
if (sl_next != 0) {
|
||||||
|
|
||||||
/* convert to signed: (-1)**k+1 * ceil(k/2) */
|
/* convert to signed: (-1)**k+1 * ceil(k/2) */
|
||||||
sl_udelta = ngx_rtmp_bit_read_golomb(&br);
|
sl_udelta = (ngx_uint_t)ngx_rtmp_bit_read_golomb(&br);
|
||||||
sl_delta = (sl_udelta + 1) >> 1;
|
sl_delta = (sl_udelta + 1) >> 1;
|
||||||
if ((sl_udelta & 1) == 0) {
|
if ((sl_udelta & 1) == 0) {
|
||||||
sl_delta = -sl_delta;
|
sl_delta = -sl_delta;
|
||||||
|
|
|
@ -504,6 +504,9 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
struct sockaddr *sa;
|
struct sockaddr *sa;
|
||||||
ngx_rtmp_listen_t *ls;
|
ngx_rtmp_listen_t *ls;
|
||||||
struct sockaddr_in *sin;
|
struct sockaddr_in *sin;
|
||||||
|
#if (nginx_version >= 1011000)
|
||||||
|
u_char *sa_cp;
|
||||||
|
#endif
|
||||||
ngx_rtmp_core_main_conf_t *cmcf;
|
ngx_rtmp_core_main_conf_t *cmcf;
|
||||||
#if (NGX_HAVE_INET6)
|
#if (NGX_HAVE_INET6)
|
||||||
struct sockaddr_in6 *sin6;
|
struct sockaddr_in6 *sin6;
|
||||||
|
@ -558,7 +561,8 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (nginx_version >= 1011000)
|
#if (nginx_version >= 1011000)
|
||||||
if (ngx_memcmp(ls[i].sockaddr + off, &u.sockaddr + off, len) != 0) {
|
sa_cp = (u_char *)(&u.sockaddr);
|
||||||
|
if (ngx_memcmp(ls[i].sockaddr + off, sa_cp + off, len) != 0) {
|
||||||
#else
|
#else
|
||||||
if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) {
|
if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) {
|
||||||
#endif
|
#endif
|
||||||
|
@ -582,7 +586,8 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
ngx_memzero(ls, sizeof(ngx_rtmp_listen_t));
|
ngx_memzero(ls, sizeof(ngx_rtmp_listen_t));
|
||||||
|
|
||||||
#if (nginx_version >= 1011000)
|
#if (nginx_version >= 1011000)
|
||||||
ngx_memcpy(ls->sockaddr, &u.sockaddr, u.socklen);
|
sa_cp = (u_char *)(&u.sockaddr);
|
||||||
|
ngx_memcpy(ls->sockaddr, sa_cp, u.socklen);
|
||||||
#else
|
#else
|
||||||
ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen);
|
ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen);
|
||||||
#endif
|
#endif
|
||||||
|
@ -600,7 +605,6 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
|
|
||||||
if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
|
if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
|
||||||
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
|
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
|
||||||
struct sockaddr *sa;
|
|
||||||
u_char buf[NGX_SOCKADDR_STRLEN];
|
u_char buf[NGX_SOCKADDR_STRLEN];
|
||||||
|
|
||||||
sa = (struct sockaddr *) ls->sockaddr;
|
sa = (struct sockaddr *) ls->sockaddr;
|
||||||
|
|
Loading…
Reference in a new issue