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

fixed compilation

Browse source
This commit is contained in:
Roman Arutyunyan 2012-07-06 16:05:41 +04:00
parent 413443c6d7
commit eb4e9e8d90
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ngx_rtmp_play_module.c
View file

@ -394,7 +394,7 @@ ngx_rtmp_play_read_meta(ngx_rtmp_session_t *s)
n = ngx_read_file(&ctx->file, ngx_rtmp_play_buffer, n = ngx_read_file(&ctx->file, ngx_rtmp_play_buffer,
size, sizeof(ngx_rtmp_play_header) + size, sizeof(ngx_rtmp_play_header) +
NGX_RTMP_PLAY_DATA_OFFSET); NGX_RTMP_PLAY_DATA_OFFSET);
if (n != size) { if (n != (ssize_t) size) {
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"play: could not read metadata"); "play: could not read metadata");
return; return;
@ -505,7 +505,7 @@ ngx_rtmp_play_send(ngx_event_t *e)
/* read tag body */ /* read tag body */
n = ngx_read_file(&ctx->file, ngx_rtmp_play_buffer, size, n = ngx_read_file(&ctx->file, ngx_rtmp_play_buffer, size,
ctx->offset - size - 4); ctx->offset - size - 4);
if (n != size) { if (n != (ssize_t) size) {
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"play: could not read flv tag"); "play: could not read flv tag");
return; return;

2
ngx_rtmp_relay_module.c
View file

@ -1205,7 +1205,6 @@ static char *
ngx_rtmp_relay_push_pull(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_rtmp_relay_push_pull(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
ngx_str_t *value, v, n; ngx_str_t *value, v, n;
ngx_rtmp_core_app_conf_t *cacf;
ngx_rtmp_relay_app_conf_t *racf; ngx_rtmp_relay_app_conf_t *racf;
ngx_rtmp_relay_target_t *target; ngx_rtmp_relay_target_t *target;
ngx_url_t *u; ngx_url_t *u;
@ -1214,7 +1213,6 @@ ngx_rtmp_relay_push_pull(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
value = cf->args->elts; value = cf->args->elts;
cacf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_core_module);
racf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_relay_module); racf = ngx_rtmp_conf_get_module_app_conf(cf, ngx_rtmp_relay_module);
target = ngx_array_push(value[0].data[3] == 'h' target = ngx_array_push(value[0].data[3] == 'h'