diff --git a/hls/ngx_rtmp_hls_module.c b/hls/ngx_rtmp_hls_module.c index b623293..93c7fe2 100644 --- a/hls/ngx_rtmp_hls_module.c +++ b/hls/ngx_rtmp_hls_module.c @@ -1813,17 +1813,17 @@ ngx_rtmp_hls_create_app_conf(ngx_conf_t *cf) } conf->hls = NGX_CONF_UNSET; - conf->fraglen = NGX_CONF_UNSET; - conf->max_fraglen = NGX_CONF_UNSET; - conf->muxdelay = NGX_CONF_UNSET; - conf->sync = NGX_CONF_UNSET; - conf->playlen = NGX_CONF_UNSET; + conf->fraglen = NGX_CONF_UNSET_MSEC; + conf->max_fraglen = NGX_CONF_UNSET_MSEC; + conf->muxdelay = NGX_CONF_UNSET_MSEC; + conf->sync = NGX_CONF_UNSET_MSEC; + conf->playlen = NGX_CONF_UNSET_MSEC; conf->continuous = NGX_CONF_UNSET; conf->nested = NGX_CONF_UNSET; conf->naming = NGX_CONF_UNSET_UINT; conf->slicing = NGX_CONF_UNSET_UINT; - conf->max_audio_delay = NGX_CONF_UNSET; - conf->audio_buffer_size = NGX_CONF_UNSET; + conf->max_audio_delay = NGX_CONF_UNSET_MSEC; + conf->audio_buffer_size = NGX_CONF_UNSET_SIZE; conf->cleanup = NGX_CONF_UNSET; return conf; diff --git a/ngx_rtmp_auto_push_module.c b/ngx_rtmp_auto_push_module.c index e89050e..51c8186 100644 --- a/ngx_rtmp_auto_push_module.c +++ b/ngx_rtmp_auto_push_module.c @@ -271,7 +271,7 @@ ngx_rtmp_auto_push_create_conf(ngx_cycle_t *cycle) } apcf->auto_push = NGX_CONF_UNSET; - apcf->push_reconnect = NGX_CONF_UNSET; + apcf->push_reconnect = NGX_CONF_UNSET_MSEC; return apcf; } diff --git a/ngx_rtmp_core_module.c b/ngx_rtmp_core_module.c index 6d4d142..9e7f1cd 100644 --- a/ngx_rtmp_core_module.c +++ b/ngx_rtmp_core_module.c @@ -233,10 +233,10 @@ ngx_rtmp_core_create_srv_conf(ngx_conf_t *cf) conf->so_keepalive = NGX_CONF_UNSET; conf->max_streams = NGX_CONF_UNSET; conf->chunk_size = NGX_CONF_UNSET; - conf->ack_window = NGX_CONF_UNSET; - conf->max_message = NGX_CONF_UNSET; - conf->out_queue = NGX_CONF_UNSET; - conf->out_cork = NGX_CONF_UNSET; + conf->ack_window = NGX_CONF_UNSET_UINT; + conf->max_message = NGX_CONF_UNSET_SIZE; + conf->out_queue = NGX_CONF_UNSET_SIZE; + conf->out_cork = NGX_CONF_UNSET_SIZE; conf->play_time_fix = NGX_CONF_UNSET; conf->publish_time_fix = NGX_CONF_UNSET; conf->busy = NGX_CONF_UNSET; diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c index 8217644..19d324a 100644 --- a/ngx_rtmp_live_module.c +++ b/ngx_rtmp_live_module.c @@ -152,9 +152,9 @@ ngx_rtmp_live_create_app_conf(ngx_conf_t *cf) lacf->live = NGX_CONF_UNSET; lacf->meta = NGX_CONF_UNSET; lacf->nbuckets = NGX_CONF_UNSET; - lacf->buflen = NGX_CONF_UNSET; - lacf->sync = NGX_CONF_UNSET; - lacf->idle_timeout = NGX_CONF_UNSET; + lacf->buflen = NGX_CONF_UNSET_MSEC; + lacf->sync = NGX_CONF_UNSET_MSEC; + lacf->idle_timeout = NGX_CONF_UNSET_MSEC; lacf->interleave = NGX_CONF_UNSET; lacf->wait_key = NGX_CONF_UNSET; lacf->wait_video = NGX_CONF_UNSET; diff --git a/ngx_rtmp_notify_module.c b/ngx_rtmp_notify_module.c index bfb6d18..85e9185 100644 --- a/ngx_rtmp_notify_module.c +++ b/ngx_rtmp_notify_module.c @@ -236,8 +236,8 @@ ngx_rtmp_notify_create_app_conf(ngx_conf_t *cf) nacf->url[n] = NGX_CONF_UNSET_PTR; } - nacf->method = NGX_CONF_UNSET; - nacf->update_timeout = NGX_CONF_UNSET; + nacf->method = NGX_CONF_UNSET_UINT; + nacf->update_timeout = NGX_CONF_UNSET_MSEC; nacf->update_strict = NGX_CONF_UNSET; nacf->relay_redirect = NGX_CONF_UNSET; @@ -289,7 +289,7 @@ ngx_rtmp_notify_create_srv_conf(ngx_conf_t *cf) nscf->url[n] = NGX_CONF_UNSET_PTR; } - nscf->method = NGX_CONF_UNSET; + nscf->method = NGX_CONF_UNSET_UINT; return nscf; } diff --git a/ngx_rtmp_record_module.c b/ngx_rtmp_record_module.c index 1137d8f..a21e282 100644 --- a/ngx_rtmp_record_module.c +++ b/ngx_rtmp_record_module.c @@ -188,14 +188,14 @@ ngx_rtmp_record_create_app_conf(ngx_conf_t *cf) return NULL; } - racf->max_size = NGX_CONF_UNSET; - racf->max_frames = NGX_CONF_UNSET; - racf->interval = NGX_CONF_UNSET; - racf->unique = NGX_CONF_UNSET; - racf->append = NGX_CONF_UNSET; - racf->lock_file = NGX_CONF_UNSET; - racf->notify = NGX_CONF_UNSET; - racf->url = NGX_CONF_UNSET_PTR; + racf->max_size = NGX_CONF_UNSET_SIZE; + racf->max_frames = NGX_CONF_UNSET_SIZE; + racf->interval = NGX_CONF_UNSET_MSEC; + racf->unique = NGX_CONF_UNSET; + racf->append = NGX_CONF_UNSET; + racf->lock_file = NGX_CONF_UNSET; + racf->notify = NGX_CONF_UNSET; + racf->url = NGX_CONF_UNSET_PTR; if (ngx_array_init(&racf->rec, cf->pool, 1, sizeof(void *)) != NGX_OK) { return NULL; diff --git a/ngx_rtmp_relay_module.c b/ngx_rtmp_relay_module.c index 4944b04..db45dcc 100644 --- a/ngx_rtmp_relay_module.c +++ b/ngx_rtmp_relay_module.c @@ -186,10 +186,10 @@ ngx_rtmp_relay_create_app_conf(ngx_conf_t *cf) racf->nbuckets = 1024; racf->log = &cf->cycle->new_log; - racf->buflen = NGX_CONF_UNSET; + racf->buflen = NGX_CONF_UNSET_MSEC; racf->session_relay = NGX_CONF_UNSET; - racf->push_reconnect = NGX_CONF_UNSET; - racf->pull_reconnect = NGX_CONF_UNSET; + racf->push_reconnect = NGX_CONF_UNSET_MSEC; + racf->pull_reconnect = NGX_CONF_UNSET_MSEC; return racf; }