zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-17 00:51:09 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #160 from sergey-dryabzhinsky/issue-158-fix-windows-build-with-1.11-nginx

Browse source 
Type conversions for MSVS
This commit is contained in:
Sergey 2016-06-25 17:15:06 +03:00 committed by GitHub
parent aee81e3c8f eca3fa3b04
commit 1d5a20ea2b
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hls/ngx_rtmp_hls_module.c
View file

@ -1050,7 +1050,7 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
}
// 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,
"hls: open fragment file='%s', keyfile='%s', "

2
ngx_rtmp_codec_module.c
View file

@ -454,7 +454,7 @@ ngx_rtmp_codec_parse_avc_header(ngx_rtmp_session_t *s, ngx_chain_t *in)
if (sl_next != 0) {
/* 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;
if ((sl_udelta & 1) == 0) {
sl_delta = -sl_delta;

10
ngx_rtmp_core_module.c
View file

@ -504,6 +504,9 @@ ngx_rtmp_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
struct sockaddr *sa;
ngx_rtmp_listen_t *ls;
struct sockaddr_in *sin;
#if (nginx_version >= 1011000)
u_char *sa_cp;
#endif
ngx_rtmp_core_main_conf_t *cmcf;
#if (NGX_HAVE_INET6)
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 (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
if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) {
#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));
#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
ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen);
#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_HAVE_INET6 && defined IPV6_V6ONLY)
struct sockaddr *sa;
u_char buf[NGX_SOCKADDR_STRLEN];
sa = (struct sockaddr *) ls->sockaddr;